mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 13:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to add back a failsafe in memory_init

Browse Source
This commit is contained in:
ptitSeb
2022-10-06 11:04:42 +02:00
parent 50eed71ab0
commit 6b51a64fae
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vm/src/instance/mod.rs
View File

@@ -721,9 +721,13 @@ impl Instance {
let passive_data = self.passive_data.borrow(); let passive_data = self.passive_data.borrow();
let data = passive_data.get(&data_index).map_or(&[][..], |d| &**d); let data = passive_data.get(&data_index).map_or(&[][..], |d| &**d);
let current_length = unsafe { memory.vmmemory().as_ref().current_length };
if src if src
.checked_add(len) .checked_add(len)
.map_or(true, |end| end as usize > data.len()) .map_or(true, |n| n as usize > data.len())
|| dst
.checked_add(len)
.map_or(true, |m| usize::try_from(m).unwrap() > current_length)
{ {
return Err(Trap::lib(TrapCode::HeapAccessOutOfBounds)); return Err(Trap::lib(TrapCode::HeapAccessOutOfBounds));
} }
@@ -1252,9 +1256,10 @@ fn initialize_memories(
let start = get_memory_init_start(init, instance); let start = get_memory_init_start(init, instance);
unsafe { unsafe {
let current_length = memory.vmmemory().as_ref().current_length;
if start if start
.checked_add(init.data.len()) .checked_add(init.data.len())
.map_or(true, |end| end > memory.vmmemory().as_ref().current_length) .map_or(true, |end| end > current_length)
{ {
return Err(Trap::lib(TrapCode::HeapAccessOutOfBounds)); return Err(Trap::lib(TrapCode::HeapAccessOutOfBounds));
} }