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

code review suggestion

Browse Source
This commit is contained in:
Pat Hickey
2021-10-21 16:46:31 -07:00
parent 175e72bac4
commit 0370d5c1a2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,9 @@ pub unsafe extern "C" fn wasmtime_memory32_grow(
delta: u64, delta: u64,
memory_index: u32, memory_index: u32,
) -> usize { ) -> usize {
std::panic::catch_unwind(|| { // Memory grow can invoke user code provided in a ResourceLimiter{,Async},
// so we need to catch a possible panic
match std::panic::catch_unwind(|| {
let instance = (*vmctx).instance_mut(); let instance = (*vmctx).instance_mut();
let memory_index = MemoryIndex::from_u32(memory_index); let memory_index = MemoryIndex::from_u32(memory_index);
match instance.memory_grow(memory_index, delta) { match instance.memory_grow(memory_index, delta) {
@@ -198,9 +200,10 @@ pub unsafe extern "C" fn wasmtime_memory32_grow(
Ok(None) => usize::max_value(), Ok(None) => usize::max_value(),
Err(err) => crate::traphandlers::raise_user_trap(err), Err(err) => crate::traphandlers::raise_user_trap(err),
} }
}) }) {
.map_err(|panic| resume_panic(panic)) Ok(r) => r,
.unwrap() Err(p) => resume_panic(p),
}
} }
/// Implementation of `table.grow`. /// Implementation of `table.grow`.
@@ -212,7 +215,9 @@ 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 {
std::panic::catch_unwind(|| { // Table grow can invoke user code provided in a ResourceLimiter{,Async},
// so we need to catch a possible panic
match std::panic::catch_unwind(|| {
let instance = (*vmctx).instance_mut(); let instance = (*vmctx).instance_mut();
let table_index = TableIndex::from_u32(table_index); let table_index = TableIndex::from_u32(table_index);
let element = match instance.table_element_type(table_index) { let element = match instance.table_element_type(table_index) {
@@ -231,9 +236,10 @@ pub unsafe extern "C" fn wasmtime_table_grow(
Ok(None) => -1_i32 as u32, Ok(None) => -1_i32 as u32,
Err(err) => crate::traphandlers::raise_user_trap(err), Err(err) => crate::traphandlers::raise_user_trap(err),
} }
}) }) {
.map_err(|panic| resume_panic(panic)) Ok(r) => r,
.unwrap() Err(p) => resume_panic(p),
}
} }
/// Implementation of `table.fill`. /// Implementation of `table.fill`.