christoph/wamr
1
Fork 0
Code Releases Activity

Correct the table index calculation in aot_instantiation (#3903)

Browse Source 
`module_inst->table_count = module->import_table_count + module->table_count`,
using it as an index will go through `module->import_tables` and  `module->tables`,
but aot init data is only available for non-import tables.
This commit is contained in:
liang.he
2024-11-18 20:01:00 +08:00
committed by GitHub
parent 0e4dffc479
commit 0119b17526
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/iwasm/aot/aot_runtime.c
View File

@ -1785,7 +1785,7 @@ aot_instantiate(AOTModule *module, AOTModuleInstance *parent,
bool ret = false; bool ret = false;
#endif #endif
/* Check heap size */ /* Align and validate heap size */
heap_size = align_uint(heap_size, 8); heap_size = align_uint(heap_size, 8);
if (heap_size > APP_HEAP_SIZE_MAX) if (heap_size > APP_HEAP_SIZE_MAX)
heap_size = APP_HEAP_SIZE_MAX; heap_size = APP_HEAP_SIZE_MAX;
@ -2001,7 +2001,11 @@ aot_instantiate(AOTModule *module, AOTModuleInstance *parent,
AOTTableInstance *table_inst; AOTTableInstance *table_inst;
table_elem_type_t *table_data; table_elem_type_t *table_data;
table = &module->tables[i]; /* bypass imported table since AOTImportTable doesn't have init_expr */
if (i < module->import_table_count)
continue;
table = &module->tables[i - module->import_table_count];
bh_assert(table); bh_assert(table);
if (table->init_expr.init_expr_type == INIT_EXPR_NONE) { if (table->init_expr.init_expr_type == INIT_EXPR_NONE) {