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

Log warning if growing table failed (#3310)

Browse Source
This commit is contained in:
liang.he 2024-04-15 18:29:54 +08:00 committed by GitHub
parent fef26ead3e
commit 42199f163e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3366,39 +3366,49 @@ aot_table_fill(AOTModuleInstance *module_inst, uint32 tbl_idx, uint32 length,
} }
uint32 uint32
aot_table_grow(AOTModuleInstance *module_inst, uint32 tbl_idx, aot_table_grow(AOTModuleInstance *module_inst, uint32 tbl_idx, uint32 inc_size,
uint32 inc_entries, table_elem_type_t init_val) table_elem_type_t init_val)
{ {
uint32 entry_count, i, orig_tbl_sz;
AOTTableInstance *tbl_inst; AOTTableInstance *tbl_inst;
uint32 i, orig_size, total_size;
tbl_inst = module_inst->tables[tbl_idx]; tbl_inst = module_inst->tables[tbl_idx];
if (!tbl_inst) { if (!tbl_inst) {
return (uint32)-1; return (uint32)-1;
} }
orig_tbl_sz = tbl_inst->cur_size; orig_size = tbl_inst->cur_size;
if (!inc_entries) { if (!inc_size) {
return orig_tbl_sz; return orig_size;
} }
if (tbl_inst->cur_size > UINT32_MAX - inc_entries) { if (tbl_inst->cur_size > UINT32_MAX - inc_size) {
#if WASM_ENABLE_SPEC_TEST == 0
LOG_WARNING("table grow (%" PRIu32 "-> %" PRIu32
") failed because of integer overflow",
tbl_inst->cur_size, inc_size);
#endif
return (uint32)-1; return (uint32)-1;
} }
entry_count = tbl_inst->cur_size + inc_entries; total_size = tbl_inst->cur_size + inc_size;
if (entry_count > tbl_inst->max_size) { if (total_size > tbl_inst->max_size) {
#if WASM_ENABLE_SPEC_TEST == 0
LOG_WARNING("table grow (%" PRIu32 "-> %" PRIu32
") failed because of over max size",
tbl_inst->cur_size, inc_size);
#endif
return (uint32)-1; return (uint32)-1;
} }
/* fill in */ /* fill in */
for (i = 0; i < inc_entries; ++i) { for (i = 0; i < inc_size; ++i) {
tbl_inst->elems[tbl_inst->cur_size + i] = init_val; tbl_inst->elems[tbl_inst->cur_size + i] = init_val;
} }
tbl_inst->cur_size = entry_count; tbl_inst->cur_size = total_size;
return orig_tbl_sz; return orig_size;
} }
#endif /* WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 */ #endif /* WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0 */

10
core/iwasm/interpreter/wasm_runtime.c
View File

@ -4353,11 +4353,21 @@ llvm_jit_table_grow(WASMModuleInstance *module_inst, uint32 tbl_idx,
} }
if (tbl_inst->cur_size > UINT32_MAX - inc_size) { /* integer overflow */ if (tbl_inst->cur_size > UINT32_MAX - inc_size) { /* integer overflow */
#if WASM_ENABLE_SPEC_TEST == 0
LOG_WARNING("table grow (%" PRIu32 "-> %" PRIu32
") failed because of integer overflow",
tbl_inst->cur_size, inc_size);
#endif
return (uint32)-1; return (uint32)-1;
} }
total_size = tbl_inst->cur_size + inc_size; total_size = tbl_inst->cur_size + inc_size;
if (total_size > tbl_inst->max_size) { if (total_size > tbl_inst->max_size) {
#if WASM_ENABLE_SPEC_TEST == 0
LOG_WARNING("table grow (%" PRIu32 "-> %" PRIu32
") failed because of over max size",
tbl_inst->cur_size, inc_size);
#endif
return (uint32)-1; return (uint32)-1;
} }