Skip to content

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

Fix off-by-one error in enum discriminant validation (#12356)

Zijie Zhaodde8960d0df5
diff --git a/crates/environ/src/fact/trampoline.rs b/crates/environ/src/fact/trampoline.rs
index d3bdecc42b..928fdaa72e 100644
--- a/crates/environ/src/fact/trampoline.rs
+++ b/crates/environ/src/fact/trampoline.rs
@@ -3042,7 +3042,7 @@ impl<'a, 'b> Compiler<'a, 'b> {
// Assert that the discriminant is valid.
self.instruction(I32Const(i32::try_from(src_ty.names.len()).unwrap()));
- self.instruction(I32GtU);
+ self.instruction(I32GeU);
self.instruction(If(BlockType::Empty));
self.trap(Trap::InvalidDiscriminant);
self.instruction(End);
diff --git a/tests/misc_testsuite/component-model/enum_discriminant.wast b/tests/misc_testsuite/component-model/enum_discriminant.wast
new file mode 100644
index 0000000000..a22d8a3f6e
--- /dev/null
+++ b/tests/misc_testsuite/component-model/enum_discriminant.wast
@@ -0,0 +1,26 @@
+(assert_trap
+ (component
+ (type $enum (enum "case0" "case1" "case2"))
+
+ ;; Returns invalid discriminant 3 (valid range: 0-2)
+ (component $producer
+ (import "enum" (type $enum' (eq $enum)))
+ (core module $core
+ (func (export "get") (result i32) (i32.const 3)))
+ (core instance $inst (instantiate $core))
+ (func (export "get") (result $enum') (canon lift (core func $inst "get"))))
+
+ ;; Calls producer through adapter - validation should trap here
+ (component $consumer
+ (import "enum" (type $enum' (eq $enum)))
+ (import "get" (func $get (result $enum')))
+ (core func $lowered (canon lower (func $get)))
+ (core module $core
+ (import "" "get" (func (result i32)))
+ (func $start (call 0) drop)
+ (start $start))
+ (core instance (instantiate $core (with "" (instance (export "get" (func $lowered)))))))
+
+ (instance $prod (instantiate $producer (with "enum" (type $enum))))
+ (instance (instantiate $consumer (with "enum" (type $enum)) (with "get" (func $prod "get")))))
+ "invalid variant discriminant")