T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catch panic in libcalls for memory and table grow

Browse Source
This commit is contained in:
Pat Hickey
2021-10-21 12:15:00 -07:00
parent d3deaae99d
commit 5aef8f47c8
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
crates/runtime/src/libcalls.rs
View File

@@ -59,7 +59,7 @@
use crate::externref::VMExternRef; use crate::externref::VMExternRef;
use crate::instance::Instance; use crate::instance::Instance;
use crate::table::{Table, TableElementType}; use crate::table::{Table, TableElementType};
use crate::traphandlers::{raise_lib_trap, Trap}; use crate::traphandlers::{raise_lib_trap, resume_panic, Trap};
use crate::vmcontext::{VMCallerCheckedAnyfunc, VMContext}; use crate::vmcontext::{VMCallerCheckedAnyfunc, VMContext};
use backtrace::Backtrace; use backtrace::Backtrace;
use std::mem; use std::mem;
@@ -190,13 +190,17 @@ pub unsafe extern "C" fn wasmtime_memory32_grow(
delta: u64, delta: u64,
memory_index: u32, memory_index: u32,
) -> usize { ) -> usize {
let instance = (*vmctx).instance_mut(); std::panic::catch_unwind(|| {
let memory_index = MemoryIndex::from_u32(memory_index); let instance = (*vmctx).instance_mut();
match instance.memory_grow(memory_index, delta) { let memory_index = MemoryIndex::from_u32(memory_index);
Ok(Some(size_in_bytes)) => size_in_bytes / (wasmtime_environ::WASM_PAGE_SIZE as usize), match instance.memory_grow(memory_index, delta) {
Ok(None) => usize::max_value(), Ok(Some(size_in_bytes)) => size_in_bytes / (wasmtime_environ::WASM_PAGE_SIZE as usize),
Err(err) => crate::traphandlers::raise_user_trap(err), Ok(None) => usize::max_value(),
} Err(err) => crate::traphandlers::raise_user_trap(err),
}
})
.map_err(|panic| resume_panic(panic))
.unwrap()
} }
/// Implementation of `table.grow`. /// Implementation of `table.grow`.
@@ -208,24 +212,28 @@ pub unsafe extern "C" fn wasmtime_table_grow(
// or is a `VMExternRef` until we look at the table type. // or is a `VMExternRef` until we look at the table type.
init_value: *mut u8, init_value: *mut u8,
) -> u32 { ) -> u32 {
let instance = (*vmctx).instance_mut(); std::panic::catch_unwind(|| {
let table_index = TableIndex::from_u32(table_index); let instance = (*vmctx).instance_mut();
let element = match instance.table_element_type(table_index) { let table_index = TableIndex::from_u32(table_index);
TableElementType::Func => (init_value as *mut VMCallerCheckedAnyfunc).into(), let element = match instance.table_element_type(table_index) {
TableElementType::Extern => { TableElementType::Func => (init_value as *mut VMCallerCheckedAnyfunc).into(),
let init_value = if init_value.is_null() { TableElementType::Extern => {
None let init_value = if init_value.is_null() {
} else { None
Some(VMExternRef::clone_from_raw(init_value)) } else {
}; Some(VMExternRef::clone_from_raw(init_value))
init_value.into() };
init_value.into()
}
};
match instance.table_grow(table_index, delta, element) {
Ok(Some(r)) => r,
Ok(None) => -1_i32 as u32,
Err(err) => crate::traphandlers::raise_user_trap(err),
} }
}; })
match instance.table_grow(table_index, delta, element) { .map_err(|panic| resume_panic(panic))
Ok(Some(r)) => r, .unwrap()
Ok(None) => -1_i32 as u32,
Err(err) => crate::traphandlers::raise_user_trap(err),
}
} }
/// Implementation of `table.fill`. /// Implementation of `table.fill`.