Skip to content

Commit

Permalink
use .get() instead of []
Browse files Browse the repository at this point in the history
  • Loading branch information
colmazia committed Sep 30, 2022
1 parent 7a62a4f commit a53ea7e
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions packages/vm/src/imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ where
}
let memory = env.memory()?;
require_mem_range(memory.size().bytes().0, safe_add(ptr, len)?)?;
Ok(memory.view()[safe_convert(ptr)?..safe_add(ptr, len)?]
Ok(memory
.view()
.get(safe_convert(ptr)?..safe_add(ptr, len)?)
.ok_or(Error::MemoryOutOfBoundError)?
.iter()
.map(|cell| cell.get())
.collect())
Expand All @@ -52,7 +55,11 @@ where
let memory = env.memory()?;
require_mem_range(memory.size().bytes().0, safe_add(ptr, safe_convert(data.len())?)?)?;
for (idx, byte) in data.iter().enumerate() {
memory.view()[safe_add(ptr, safe_convert(idx)?)?].set(*byte);
memory
.view()
.get(safe_add(ptr, safe_convert(idx)?)?)
.ok_or(Error::MemoryOutOfBoundError)?
.set(*byte);
}
Ok(safe_convert(data.len())?)
}
Expand Down

0 comments on commit a53ea7e

Please sign in to comment.