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

Fix table index calculations in wasm_loader and wasm_mini_loader (#4004)

Browse Source
This commit is contained in:
liang.he 2025-01-05 15:27:40 +08:00 committed by GitHub
parent 099056b076
commit 1958808a24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,9 @@ is_table_64bit(WASMModule *module, uint32 table_idx)
return !!(module->import_tables[table_idx].u.table.table_type.flags return !!(module->import_tables[table_idx].u.table.table_type.flags
& TABLE64_FLAG); & TABLE64_FLAG);
else else
return !!(module->tables[table_idx].table_type.flags & TABLE64_FLAG); return !!(module->tables[table_idx - module->import_table_count]
.table_type.flags
& TABLE64_FLAG);
return false; return false;
} }
@ -4285,7 +4287,8 @@ check_table_elem_type(WASMModule *module, uint32 table_index,
module->import_tables[table_index].u.table.table_type.elem_type; module->import_tables[table_index].u.table.table_type.elem_type;
else else
table_declared_elem_type = table_declared_elem_type =
(module->tables + table_index)->table_type.elem_type; module->tables[table_index - module->import_table_count]
.table_type.elem_type;
if (table_declared_elem_type == type_from_elem_seg) if (table_declared_elem_type == type_from_elem_seg)
return true; return true;
@ -10854,12 +10857,12 @@ get_table_elem_type(const WASMModule *module, uint32 table_idx,
else { else {
if (p_elem_type) if (p_elem_type)
*p_elem_type = *p_elem_type =
module->tables[module->import_table_count + table_idx] module->tables[table_idx - module->import_table_count]
.table_type.elem_type; .table_type.elem_type;
#if WASM_ENABLE_GC != 0 #if WASM_ENABLE_GC != 0
if (p_ref_type) if (p_ref_type)
*((WASMRefType **)p_ref_type) = *((WASMRefType **)p_ref_type) =
module->tables[module->import_table_count + table_idx] module->tables[table_idx - module->import_table_count]
.table_type.elem_ref_type; .table_type.elem_ref_type;
#endif #endif
} }

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

@ -48,7 +48,9 @@ is_table_64bit(WASMModule *module, uint32 table_idx)
return !!(module->import_tables[table_idx].u.table.table_type.flags return !!(module->import_tables[table_idx].u.table.table_type.flags
& TABLE64_FLAG); & TABLE64_FLAG);
else else
return !!(module->tables[table_idx].table_type.flags & TABLE64_FLAG); return !!(module->tables[table_idx - module->import_table_count]
.table_type.flags
& TABLE64_FLAG);
return false; return false;
} }
@ -2566,7 +2568,7 @@ get_table_elem_type(const WASMModule *module, uint32 table_idx,
module->import_tables[table_idx].u.table.table_type.elem_type; module->import_tables[table_idx].u.table.table_type.elem_type;
else else
*p_elem_type = *p_elem_type =
module->tables[module->import_table_count + table_idx] module->tables[table_idx - module->import_table_count]
.table_type.elem_type; .table_type.elem_type;
} }
return true; return true;