Skip to content

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

Fix error message for out-of-bounds variant discriminants (#12885)

Alex Crichtonb8a3e205baff
diff --git a/crates/wasmtime/src/runtime/component/values.rs b/crates/wasmtime/src/runtime/component/values.rs
index 6a5e8bba9e..af5d0b1a2f 100644
--- a/crates/wasmtime/src/runtime/component/values.rs
+++ b/crates/wasmtime/src/runtime/component/values.rs
@@ -1045,13 +1045,10 @@ fn load_variant(
u32::linear_lift_from_memory(cx, InterfaceType::U32, &bytes[..4])?
}
};
- let case_ty = types.nth(discriminant as usize).ok_or_else(|| {
- format_err!(
- "discriminant {} out of range [0..{})",
- discriminant,
- types.len()
- )
- })?;
+ let len = types.len();
+ let case_ty = types
+ .nth(discriminant as usize)
+ .ok_or_else(|| format_err!("discriminant {discriminant} out of range [0..{len})"))?;
let value = match case_ty {
Some(case_ty) => {
let payload_offset = usize::try_from(info.payload_offset32).unwrap();
diff --git a/tests/misc_testsuite/component-model/types.wast b/tests/misc_testsuite/component-model/types.wast
index 9596ebe6ee..2fe0fa25ff 100644
--- a/tests/misc_testsuite/component-model/types.wast
+++ b/tests/misc_testsuite/component-model/types.wast
@@ -353,3 +353,26 @@
(export "t" (instance $t (type $t')))
))
)
+
+(component definition $A
+ (type $t' (variant (case "a" u32) (case "b")))
+ (export $t "t" (type $t'))
+
+ (core module $m
+ (memory (export "m") 1)
+ (func (export "f") (param i32) (result i32)
+ (i32.store8
+ (i32.const 0)
+ (local.get 0))
+ i32.const 0)
+ )
+ (core instance $m (instantiate $m))
+ (func (export "f") (param "a" u32) (result $t)
+ (canon lift (core func $m "f") (memory $m "m"))
+ )
+)
+
+(component instance $A $A)
+(assert_return (invoke "f" (u32.const 0)) (variant.const "a" (u32.const 0)))
+(assert_return (invoke "f" (u32.const 1)) (variant.const "b"))
+(assert_trap (invoke "f" (u32.const 2)) "discriminant 2 out of range [0..2)")