A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Handle empty names in the component C API (#14869)
Randolf J.514478c02ff6
diff --git a/crates/c-api/src/component/component.rs b/crates/c-api/src/component/component.rsindex cc71dc0d2c..c15cf92e72 100644--- a/crates/c-api/src/component/component.rs+++ b/crates/c-api/src/component/component.rs@@ -161,7 +161,7 @@ pub unsafe extern "C" fn wasmtime_component_get_export_index(name: *const u8,name_len: usize,) -> Option<Box<wasmtime_component_export_index_t>> {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return None;};diff --git a/crates/c-api/src/component/instance.rs b/crates/c-api/src/component/instance.rsindex a083d057d6..8286fca7f6 100644--- a/crates/c-api/src/component/instance.rs+++ b/crates/c-api/src/component/instance.rs@@ -12,7 +12,7 @@ pub unsafe extern "C" fn wasmtime_component_instance_get_export_index(name: *const u8,name_len: usize,) -> Option<Box<wasmtime_component_export_index_t>> {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return None;};diff --git a/crates/c-api/src/component/linker.rs b/crates/c-api/src/component/linker.rsindex 18c3ea37a0..b4c1d88b72 100644--- a/crates/c-api/src/component/linker.rs+++ b/crates/c-api/src/component/linker.rs@@ -64,7 +64,7 @@ pub unsafe extern "C" fn wasmtime_component_linker_instance_add_instance<'a>(name_len: usize,linker_instance_out: &mut *mut wasmtime_component_linker_instance_t<'a>,) -> Option<Box<wasmtime_error_t>> {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return crate::bad_utf8();};@@ -84,7 +84,7 @@ pub unsafe extern "C" fn wasmtime_component_linker_instance_add_module(name_len: usize,module: &wasmtime_module_t,) -> Option<Box<wasmtime_error_t>> {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return crate::bad_utf8();};@@ -117,7 +117,7 @@ pub unsafe extern "C" fn wasmtime_component_linker_instance_add_func() -> Option<Box<wasmtime_error_t>> {let foreign = crate::ForeignData { data, finalizer };- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return crate::bad_utf8();};@@ -183,7 +183,7 @@ pub unsafe extern "C" fn wasmtime_component_linker_instance_add_func_async() -> Option<Box<wasmtime_error_t>> {let foreign = crate::ForeignData { data, finalizer };- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return crate::bad_utf8();};@@ -336,7 +336,7 @@ pub unsafe extern "C" fn wasmtime_component_linker_instance_add_resource() -> Option<Box<wasmtime_error_t>> {let foreign = crate::ForeignData { data, finalizer };- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return crate::bad_utf8();};diff --git a/crates/c-api/src/component/types/component.rs b/crates/c-api/src/component/types/component.rsindex 217815bc1c..8fd822b843 100644--- a/crates/c-api/src/component/types/component.rs+++ b/crates/c-api/src/component/types/component.rs@@ -31,7 +31,7 @@ pub unsafe extern "C" fn wasmtime_component_type_import_get<'a>(name_len: usize,ret: &mut MaybeUninit<Box<wasmtime_component_extern_t<'a>>>,) -> bool {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return false;};@@ -81,7 +81,7 @@ pub unsafe extern "C" fn wasmtime_component_type_export_get<'a>(name_len: usize,ret: &mut MaybeUninit<Box<wasmtime_component_extern_t<'a>>>,) -> bool {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return false;};diff --git a/crates/c-api/src/component/types/instance.rs b/crates/c-api/src/component/types/instance.rsindex edf2843e01..e465db806d 100644--- a/crates/c-api/src/component/types/instance.rs+++ b/crates/c-api/src/component/types/instance.rs@@ -27,7 +27,7 @@ pub unsafe extern "C" fn wasmtime_component_instance_type_export_get<'a>(name_len: usize,ret: &mut MaybeUninit<Box<wasmtime_component_extern_t<'a>>>,) -> bool {- let name = unsafe { std::slice::from_raw_parts(name, name_len) };+ let name = unsafe { crate::slice_from_raw_parts(name, name_len) };let Ok(name) = std::str::from_utf8(name) else {return false;};diff --git a/crates/c-api/tests/component/linker.cc b/crates/c-api/tests/component/linker.ccindex 012c6905dd..266a06e5e5 100644--- a/crates/c-api/tests/component/linker.cc+++ b/crates/c-api/tests/component/linker.cc@@ -61,6 +61,36 @@ TEST(Linker, finalizes_callbacks_when_name_parsing_fails) {wasmtime_component_linker_delete(raw);}+TEST(Linker, empty_names) {+ wasmtime::Engine engine;+ Linker linker(engine);+ linker.allow_shadowing(true);+ auto module = wasmtime::Module::compile(engine, "(module)").unwrap();++ // A default `std::string_view` is a null pointer with a zero length.+ std::string_view empty;+ auto root = linker.root();+ root.add_module(empty, module).unwrap();+ root.add_func(empty,+ [](wasmtime::Store::Context, const FuncType &,+ wasmtime::Span<Val>,+ wasmtime::Span<Val>) -> wasmtime::Result<std::monostate> {+ return std::monostate();+ })+ .unwrap();+ root.add_resource(empty, ResourceType(1),+ [](wasmtime::Store::Context,+ uint32_t) -> wasmtime::Result<std::monostate> {+ return std::monostate();+ })+ .unwrap();+ // The C++ API doesn't have async functions.+ auto *error = wasmtime_component_linker_instance_add_func_async(+ root.capi(), nullptr, 0, async_func_callback, nullptr, nullptr);+ EXPECT_EQ(error, nullptr);+ root.add_instance(empty).unwrap();+}+TEST(Linker, allow_shadowing) {wasmtime::Engine engine;Linker linker(engine);diff --git a/crates/c-api/tests/component/lookup_func.cc b/crates/c-api/tests/component/lookup_func.ccindex 310e3d6d9e..8f50d2ccde 100644--- a/crates/c-api/tests/component/lookup_func.cc+++ b/crates/c-api/tests/component/lookup_func.cc@@ -39,3 +39,17 @@ TEST(component, lookup_func) {auto f2 = instance.get_export_index(context, nullptr, "f");EXPECT_TRUE(f2);}++TEST(component, lookup_empty_name) {+ wasmtime::Engine engine;+ wasmtime::Store store(engine);+ auto context = store.context();+ Component component = Component::compile(engine, "(component)").unwrap();++ // A default `std::string_view` has a null data pointer.+ EXPECT_FALSE(component.export_index(nullptr, std::string_view{}));++ Linker linker(engine);+ auto instance = linker.instantiate(context, component).unwrap();+ EXPECT_FALSE(instance.get_export_index(context, nullptr, std::string_view{}));+}diff --git a/crates/c-api/tests/component/types.cc b/crates/c-api/tests/component/types.ccindex 71d95244a3..1ae021b419 100644--- a/crates/c-api/tests/component/types.cc+++ b/crates/c-api/tests/component/types.cc@@ -70,6 +70,25 @@ TEST(types, component_instance) {EXPECT_EQ(resource_ty, ty2.export_get(engine, "t")->type().resource());}+TEST(types, empty_name) {+ Engine engine;++ auto component = Component::compile(engine, R"(+(component+ (import "x" (instance $a (export "t" (type (sub resource)))))+ (export "x" (instance $a))+)+ )")+ .unwrap()+ .type();++ // A default `std::string_view` has a null data pointer.+ EXPECT_FALSE(component.import_get(engine, std::string_view{}));+ EXPECT_FALSE(component.export_get(engine, std::string_view{}));+ auto ty = component.import_get(engine, "x")->type().component_instance();+ EXPECT_FALSE(ty.export_get(engine, std::string_view{}));+}+TEST(types, component_func) {Engine engine;