Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions crates/wasmtime/src/func.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1611,13 +1611,22 @@ macro_rules! impl_into_func {
)
}))
};

// Note that we need to be careful when dealing with traps
// here. Traps are implemented with longjmp/setjmp meaning
// that it's not unwinding and consequently no Rust
// destructors are run. We need to be careful to ensure that
// nothing on the stack needs a destructor when we exit
// abnormally from this `match`, e.g. on `Err`, on
// cross-store-issues, or if `Ok(Err)` is raised.
match ret {
Err(panic) => wasmtime_runtime::resume_panic(panic),
Ok(ret) => {
// Because the wrapped function is not `unsafe`, we
// can't assume it returned a value that is
// compatible with this store.
if !ret.compatible_with_store(weak_store) {
drop(ret);
raise_cross_store_trap();
}

Expand Down
27 changes: 27 additions & 0 deletions tests/all/funcref.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use super::ref_types_module;
use std::cell::Cell;
use std::rc::Rc;
use wasmtime::*;

#[test]
Expand Down Expand Up @@ -83,3 +85,28 @@ fn receive_null_funcref_from_wasm() -> anyhow::Result<()> {

Ok(())
}

#[test]
fn wrong_store() -> anyhow::Result<()> {
let dropped = Rc::new(Cell::new(false));
{
let store1 = Store::default();
let store2 = Store::default();

let set = SetOnDrop(dropped.clone());
let f1 = Func::wrap(&store1, move || drop(&set));
let f2 = Func::wrap(&store2, move || Some(f1.clone()));
assert!(f2.call(&[]).is_err());
}
assert!(dropped.get());

return Ok(());

struct SetOnDrop(Rc<Cell<bool>>);

impl Drop for SetOnDrop {
fn drop(&mut self) {
self.0.set(true);
}
}
}