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

aot compiler: Track non-0x00 tableindex as ref types use (#3695)

Browse Source 
Any use of a table index that isn't exactly a null byte (`0x00`) means that
the module makes use of the reference types proposal. This is important
to track because `aot_compiler.c` will blindly assume that all table indices
are a single byte long otherwise.

This fixes a crash in WAMR for modules that contain multi-byte encodings
of table indices in `call_indirect` but make no other use of reference types
features.
This commit is contained in:
Jan Olaf Martin 2024-08-15 21:37:10 -07:00 committed by GitHub
parent a44c487632
commit 59f761b58d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12004,6 +12004,14 @@ re_scan:
read_leb_uint32(p, p_end, type_idx); read_leb_uint32(p, p_end, type_idx);
#if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 #if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0
#if WASM_ENABLE_WAMR_COMPILER != 0
if (*p != 0x00) {
// Any non-0x00 byte requires the ref types proposal.
// This is different from checking the table_idx value
// since `0x80 0x00` etc. are all valid encodings of zero.
module->is_ref_types_used = true;
}
#endif
read_leb_uint32(p, p_end, table_idx); read_leb_uint32(p, p_end, table_idx);
#else #else
CHECK_BUF(p, p_end, 1); CHECK_BUF(p, p_end, 1);