Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Run linker callback finalizers on invalid names (#14126)

grandpig0b9b72dc2bc7
diff --git a/crates/c-api/src/async.rs b/crates/c-api/src/async.rs
index a3d0790019..6e7b68bbd7 100644
--- a/crates/c-api/src/async.rs
+++ b/crates/c-api/src/async.rs
@@ -288,9 +288,9 @@ pub unsafe extern "C" fn wasmtime_linker_define_async_func(
finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
) -> Option<Box<wasmtime_error_t>> {
let ty = ty.ty().ty(linker.linker.engine());
+ let cb = c_async_callback_to_rust_fn(callback, data, finalizer);
let module = to_str!(module, module_len);
let name = to_str!(name, name_len);
- let cb = c_async_callback_to_rust_fn(callback, data, finalizer);
handle_result(
linker.linker.func_new_async(module, name, ty, cb),
diff --git a/crates/c-api/src/linker.rs b/crates/c-api/src/linker.rs
index f7b1da6308..b21422a8bc 100644
--- a/crates/c-api/src/linker.rs
+++ b/crates/c-api/src/linker.rs
@@ -79,9 +79,9 @@ pub unsafe extern "C" fn wasmtime_linker_define_func(
finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
) -> Option<Box<wasmtime_error_t>> {
let ty = ty.ty().ty(linker.linker.engine());
+ let cb = crate::func::c_callback_to_rust_fn(callback, data, finalizer);
let module = to_str!(module, module_len);
let name = to_str!(name, name_len);
- let cb = crate::func::c_callback_to_rust_fn(callback, data, finalizer);
handle_result(linker.linker.func_new(module, name, ty, cb), |_linker| ())
}
@@ -98,9 +98,9 @@ pub unsafe extern "C" fn wasmtime_linker_define_func_unchecked(
finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
) -> Option<Box<wasmtime_error_t>> {
let ty = ty.ty().ty(linker.linker.engine());
+ let cb = crate::func::c_unchecked_callback_to_rust_fn(callback, data, finalizer);
let module = to_str!(module, module_len);
let name = to_str!(name, name_len);
- let cb = crate::func::c_unchecked_callback_to_rust_fn(callback, data, finalizer);
handle_result(
linker.linker.func_new_unchecked(module, name, ty, cb),
|_linker| (),
diff --git a/crates/c-api/tests/async.cc b/crates/c-api/tests/async.cc
index 7f39618783..7785ed1664 100644
--- a/crates/c-api/tests/async.cc
+++ b/crates/c-api/tests/async.cc
@@ -6,6 +6,33 @@
using namespace wasmtime;
+namespace {
+
+void async_callback(void *, wasmtime_caller_t *, const wasmtime_val_t *, size_t,
+ wasmtime_val_t *, size_t, wasm_trap_t **,
+ wasmtime_async_continuation_t *) {}
+
+void finalize(void *data) { *static_cast<bool *>(data) = true; }
+
+} // namespace
+
+TEST(async, finalizes_callback_when_name_parsing_fails) {
+ Engine engine;
+ Linker linker(engine);
+ auto *ty = wasm_functype_new_0_0();
+ const char invalid_utf8[] = {static_cast<char>(0xff)};
+ bool finalized = false;
+
+ auto *error = wasmtime_linker_define_async_func(
+ linker.capi(), invalid_utf8, sizeof(invalid_utf8), "name", 4, ty,
+ async_callback, &finalized, finalize);
+
+ ASSERT_NE(error, nullptr);
+ wasmtime_error_delete(error);
+ EXPECT_TRUE(finalized);
+ wasm_functype_delete(ty);
+}
+
TEST(async, call_func_async) {
Engine engine;
Store store(engine);
diff --git a/crates/c-api/tests/linker.cc b/crates/c-api/tests/linker.cc
index 3f99af4f4d..730c6b3a3b 100644
--- a/crates/c-api/tests/linker.cc
+++ b/crates/c-api/tests/linker.cc
@@ -1,9 +1,26 @@
#include <gtest/gtest.h>
+#include <wasmtime.h>
#include <wasmtime/func.hh>
#include <wasmtime/linker.hh>
using namespace wasmtime;
+namespace {
+
+wasm_trap_t *callback(void *, wasmtime_caller_t *, const wasmtime_val_t *,
+ size_t, wasmtime_val_t *, size_t) {
+ return nullptr;
+}
+
+wasm_trap_t *unchecked_callback(void *, wasmtime_caller_t *,
+ wasmtime_val_raw_t *, size_t) {
+ return nullptr;
+}
+
+void finalize(void *data) { *static_cast<bool *>(data) = true; }
+
+} // namespace
+
TEST(Linker, Smoke) {
Engine engine;
Linker linker(engine);
@@ -75,6 +92,31 @@ TEST(Linker, CallableCopy) {
linker.func_new("a", "f", FuncType({}, {}), cf).unwrap();
}
+TEST(Linker, FinalizesCallbacksWhenNameParsingFails) {
+ Engine engine;
+ Linker linker(engine);
+ auto *ty = wasm_functype_new_0_0();
+ const char invalid_utf8[] = {static_cast<char>(0xff)};
+
+ bool finalized = false;
+ auto *error = wasmtime_linker_define_func(linker.capi(), invalid_utf8,
+ sizeof(invalid_utf8), "name", 4, ty,
+ callback, &finalized, finalize);
+ ASSERT_NE(error, nullptr);
+ wasmtime_error_delete(error);
+ EXPECT_TRUE(finalized);
+
+ finalized = false;
+ error = wasmtime_linker_define_func_unchecked(
+ linker.capi(), "module", 6, invalid_utf8, sizeof(invalid_utf8), ty,
+ unchecked_callback, &finalized, finalize);
+ ASSERT_NE(error, nullptr);
+ wasmtime_error_delete(error);
+ EXPECT_TRUE(finalized);
+
+ wasm_functype_delete(ty);
+}
+
TEST(Linker, DefineUnknownImportsAsTraps) {
Engine engine;
Linker linker(engine);