language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm_interp: create a new error MemoryAccessOutOfBounds

Browse source
This commit is contained in:
Brian Carroll 2023-05-07 07:39:01 +01:00 • committed by Folkert
parent 17d8ef2aa7
commit a3b5a9d9a2
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/wasm_interp/src/instance.rs
View file

@ -398,7 +398,13 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
let _alignment = self.fetch_immediate_u32(module);
let offset = self.fetch_immediate_u32(module);
let base_addr = self.value_store.pop_u32()?;
Ok(base_addr + offset)
let addr = base_addr + offset;
let memory_size = self.memory.len() as u32;
if addr >= memory_size {
Err(Error::MemoryAccessOutOfBounds(addr, memory_size))
} else {
Ok(addr)
}
}
fn get_store_addr_value(&mut self, module: &WasmModule<'a>) -> Result<(usize, Value), Error> {
@ -409,8 +415,13 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
let offset = self.fetch_immediate_u32(module);
let value = self.value_store.pop();
let base_addr = self.value_store.pop_u32()?;
let addr = (base_addr + offset) as usize;
Ok((addr, value))
let addr = base_addr + offset;
let memory_size = self.memory.len() as u32;
if addr >= memory_size {
Err(Error::MemoryAccessOutOfBounds(addr, memory_size))
} else {
Ok((addr as usize, value))
}
}
fn write_debug<T: fmt::Debug>(&mut self, value: T) {