gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-03-12 08:55:28 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix result arity check on select_t opcode (#2406)

Browse Source 
Typed select must have exactly one result. Reported in issue #2402.
This commit is contained in:
Wenyong Huang 2023-07-31 18:20:11 +08:00 committed by GitHub
parent 45a4e774de
commit edea32b629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/interpreter/wasm_loader.c
View File

@ -8066,7 +8066,8 @@ re_scan:
uint8 vec_len, ref_type; uint8 vec_len, ref_type;
read_leb_uint32(p, p_end, vec_len); read_leb_uint32(p, p_end, vec_len);
if (!vec_len) { if (vec_len != 1) {
/* typed select must have exactly one result */
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"invalid result arity"); "invalid result arity");
goto fail; goto fail;

3
core/iwasm/interpreter/wasm_mini_loader.c
View File

@ -6235,7 +6235,8 @@ re_scan:
uint8 vec_len, ref_type; uint8 vec_len, ref_type;
read_leb_uint32(p, p_end, vec_len); read_leb_uint32(p, p_end, vec_len);
if (!vec_len) { if (vec_len != 1) {
/* typed select must have exactly one result */
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"invalid result arity"); "invalid result arity");
goto fail; goto fail;

20
tests/wamr-test-suites/spec-test-script/ignore_cases.patch
View File

@ -343,26 +343,6 @@ index adb5cb7..590f626 100644
(func $g (param $x i32) (result i32) (func $g (param $x i32) (result i32)
(i32.add (local.get $x) (i32.const 1)) (i32.add (local.get $x) (i32.const 1))
) )
diff --git a/test/core/select.wast b/test/core/select.wast
index 046e6fe..b677023 100644
--- a/test/core/select.wast
+++ b/test/core/select.wast
@@ -324,6 +324,7 @@
(module (func $arity-0 (select (result) (nop) (nop) (i32.const 1))))
"invalid result arity"
)
+(;
(assert_invalid
(module (func $arity-2 (result i32 i32)
(select (result i32 i32)
@@ -334,6 +335,7 @@
))
"invalid result arity"
)
+;)
(assert_invalid
diff --git a/test/core/table_copy.wast b/test/core/table_copy.wast diff --git a/test/core/table_copy.wast b/test/core/table_copy.wast
index 380e84e..f37e745 100644 index 380e84e..f37e745 100644
--- a/test/core/table_copy.wast --- a/test/core/table_copy.wast