gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-06 15:05:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix ref.func opcode check when GC is enabled (#3181)

Browse Source 
The current code assumes that the element type of table segment can
be `funcref` only, but when GC is enabled, the type can be `(ref func)`
also.

Fixes https://github.com/bytecodealliance/wasm-micro-runtime/issues/3168.
This commit is contained in:
Wenyong Huang 2024-02-27 09:31:19 +08:00 committed by GitHub
parent 169e164815
commit 2349df1271
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4532,7 +4532,7 @@ load_table_segment_section(const uint8 *buf, const uint8 *buf_end,
"unknown element segment kind"); "unknown element segment kind");
return false; return false;
} }
#else #else /* else of WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 */
/* /*
* like: 00 41 05 0b 04 00 01 00 01 * like: 00 41 05 0b 04 00 01 00 01
* for: (elem 0 (offset (i32.const 5)) $f1 $f2 $f1 $f2) * for: (elem 0 (offset (i32.const 5)) $f1 $f2 $f1 $f2)
@ -4548,7 +4548,7 @@ load_table_segment_section(const uint8 *buf, const uint8 *buf_end,
if (!load_func_index_vec(&p, p_end, module, table_segment, if (!load_func_index_vec(&p, p_end, module, table_segment,
error_buf, error_buf_size)) error_buf, error_buf_size))
return false; return false;
#endif /* WASM_ENABLE_REF_TYPES != 0 */ #endif /* end of WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 */
#if WASM_ENABLE_WAMR_COMPILER != 0 #if WASM_ENABLE_WAMR_COMPILER != 0
if (table_segment->elem_type == VALUE_TYPE_EXTERNREF) if (table_segment->elem_type == VALUE_TYPE_EXTERNREF)
@ -12301,7 +12301,14 @@ re_scan:
note that it doesn't matter whether the table seg's mode note that it doesn't matter whether the table seg's mode
is passive, active or declarative. */ is passive, active or declarative. */
for (i = 0; i < module->table_seg_count; i++, table_seg++) { for (i = 0; i < module->table_seg_count; i++, table_seg++) {
if (table_seg->elem_type == VALUE_TYPE_FUNCREF) { if (table_seg->elem_type == VALUE_TYPE_FUNCREF
#if WASM_ENABLE_GC != 0
|| (table_seg->elem_type == REF_TYPE_HT_NON_NULLABLE
&& table_seg->elem_ref_type->ref_ht_common
.heap_type
== HEAP_TYPE_FUNC)
#endif
) {
for (j = 0; j < table_seg->value_count; j++) { for (j = 0; j < table_seg->value_count; j++) {
if (table_seg->init_values[j].u.ref_index if (table_seg->init_values[j].u.ref_index
== func_idx) { == func_idx) {