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

Compare commits

base: gnh1201:54b20ac285a9cb2347b6c614f6a5ad4fcf51f83e
Branches Tags
gnh1201:main
gnh1201:dev/extended_const
gnh1201:dev/shared_heap
gnh1201:dev/zephyr_file_socket
gnh1201:dev/runtime_instance
gnh1201:dev/simd_for_interp
gnh1201:dev/instantiate_linking
gnh1201:gitbook
gnh1201:loganek/message-ref-types
gnh1201:dev/memory64
gnh1201:dev/exce_handling
gnh1201:dev/dynamic_linking
gnh1201:dev/multi_memory
gnh1201:dev/checkpoint_and_restore
gnh1201:dev/thread_suspension
gnh1201:dev/gc_refactor
gnh1201:release/1.3.x
gnh1201:dev/dynamic_pgo
gnh1201:dev/interrupt_block_insn
gnh1201:dev/dylink
gnh1201:WAMR-2.4.0
gnh1201:WAMR-2.3.1
gnh1201:WAMR-2.3.0
gnh1201:WAMR-2.2.0
gnh1201:WAMR-2.1.2
gnh1201:WAMR-2.1.1
gnh1201:WAMR-2.1.0
gnh1201:WAMR-1.3.3
gnh1201:WAMR-2.0.0
gnh1201:WAMR-1.3.2
gnh1201:WAMR-1.3.1
gnh1201:WAMR-1.3.0
gnh1201:WAMR-1.2.3
gnh1201:WAMR-1.2.2
gnh1201:WAMR-1.2.1
gnh1201:WAMR-1.2.0
gnh1201:WAMR-1.1.2
gnh1201:WAMR-1.1.1
gnh1201:WAMR-1.1.0
gnh1201:WAMR-1.0.0
gnh1201:fast-jit-06-29-2022
gnh1201:WAMR-05-18-2022
gnh1201:WAMR-01-18-2022
gnh1201:WAMR-12-30-2021
gnh1201:WAMR-08-10-2021
gnh1201:WAMR-04-15-2021
gnh1201:WAMR-03-25-2021
gnh1201:WAMR-01-29-2021
gnh1201:WAMR-09-29-2020
gnh1201:WAMR-09-08-2020
gnh1201:WAMR-07-10-2020
gnh1201:WAMR-06-15-2020
gnh1201:WAMR-04-15-2020
gnh1201:WAMR-03-30-2020
gnh1201:WAMR-03-19-2020
gnh1201:WAMR-03-05-2020
gnh1201:WAMR-02-27-2020
gnh1201:WAMR-02-18-2020
gnh1201:01-12-2020
gnh1201:tag-11-28-2019
...
compare: gnh1201:334d60b35acfe62adccb8a3df81469894b922987
Branches Tags
gnh1201:main
gnh1201:dev/extended_const
gnh1201:dev/shared_heap
gnh1201:dev/zephyr_file_socket
gnh1201:dev/runtime_instance
gnh1201:dev/simd_for_interp
gnh1201:dev/instantiate_linking
gnh1201:gitbook
gnh1201:loganek/message-ref-types
gnh1201:dev/memory64
gnh1201:dev/exce_handling
gnh1201:dev/dynamic_linking
gnh1201:dev/multi_memory
gnh1201:dev/checkpoint_and_restore
gnh1201:dev/thread_suspension
gnh1201:dev/gc_refactor
gnh1201:release/1.3.x
gnh1201:dev/dynamic_pgo
gnh1201:dev/interrupt_block_insn
gnh1201:dev/dylink
gnh1201:WAMR-2.4.0
gnh1201:WAMR-2.3.1
gnh1201:WAMR-2.3.0
gnh1201:WAMR-2.2.0
gnh1201:WAMR-2.1.2
gnh1201:WAMR-2.1.1
gnh1201:WAMR-2.1.0
gnh1201:WAMR-1.3.3
gnh1201:WAMR-2.0.0
gnh1201:WAMR-1.3.2
gnh1201:WAMR-1.3.1
gnh1201:WAMR-1.3.0
gnh1201:WAMR-1.2.3
gnh1201:WAMR-1.2.2
gnh1201:WAMR-1.2.1
gnh1201:WAMR-1.2.0
gnh1201:WAMR-1.1.2
gnh1201:WAMR-1.1.1
gnh1201:WAMR-1.1.0
gnh1201:WAMR-1.0.0
gnh1201:fast-jit-06-29-2022
gnh1201:WAMR-05-18-2022
gnh1201:WAMR-01-18-2022
gnh1201:WAMR-12-30-2021
gnh1201:WAMR-08-10-2021
gnh1201:WAMR-04-15-2021
gnh1201:WAMR-03-25-2021
gnh1201:WAMR-01-29-2021
gnh1201:WAMR-09-29-2020
gnh1201:WAMR-09-08-2020
gnh1201:WAMR-07-10-2020
gnh1201:WAMR-06-15-2020
gnh1201:WAMR-04-15-2020
gnh1201:WAMR-03-30-2020
gnh1201:WAMR-03-19-2020
gnh1201:WAMR-03-05-2020
gnh1201:WAMR-02-27-2020
gnh1201:WAMR-02-18-2020
gnh1201:01-12-2020
gnh1201:tag-11-28-2019

2 Commits
54b20ac285 ... 334d60b35a

Author SHA1 Message Date
Zhenwei Jin
334d60b35a
Merge 3ffc82b1f6 into 9e92f5ebe1 2025-07-10 08:30:30 +08:00
zhenweijin
3ffc82b1f6 add validation for recursive type count in loader 2025-07-07 13:34:08 +08:00
1 changed files with 27 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -400,7 +400,8 @@ check_array_type(const WASMModule *module, uint32 type_index, char *error_buf,
error_buf_size)) { error_buf_size)) {
return false; return false;
} }
if (module->types[type_index]->type_flag != WASM_TYPE_ARRAY) { if (module->types[type_index] == NULL
|| module->types[type_index]->type_flag != WASM_TYPE_ARRAY) {
set_error_buf(error_buf, error_buf_size, "unknown array type"); set_error_buf(error_buf, error_buf_size, "unknown array type");
return false; return false;
} }
@ -423,7 +424,8 @@ check_function_type(const WASMModule *module, uint32 type_index,
} }
#if WASM_ENABLE_GC != 0 #if WASM_ENABLE_GC != 0
if (module->types[type_index]->type_flag != WASM_TYPE_FUNC) { if (module->types[type_index] == NULL
|| module->types[type_index]->type_flag != WASM_TYPE_FUNC) {
set_error_buf(error_buf, error_buf_size, "unknown function type"); set_error_buf(error_buf, error_buf_size, "unknown function type");
return false; return false;
} }
@ -1255,8 +1257,9 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
error_buf_size)) { error_buf_size)) {
goto fail; goto fail;
} }
if (module->types[type_idx]->type_flag if (module->types[type_idx] == NULL
!= WASM_TYPE_STRUCT) { || module->types[type_idx]->type_flag
!= WASM_TYPE_STRUCT) {
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"unknown struct type"); "unknown struct type");
goto fail; goto fail;
@ -2303,9 +2306,14 @@ load_type_section(const uint8 *buf, const uint8 *buf_end, WASMModule *module,
total_size = new_total_size; total_size = new_total_size;
} }
LOG_VERBOSE("Processing rec group [%d-%d]", if (rec_count < 1) {
processed_type_count, LOG_VERBOSE("Processing 0-entry rec group");
processed_type_count + rec_count - 1); }
else {
LOG_VERBOSE("Processing rec group [%d-%d]",
processed_type_count,
processed_type_count + rec_count - 1);
}
} }
else { else {
p--; p--;
@ -12677,7 +12685,9 @@ re_scan:
error_buf, error_buf_size)) { error_buf, error_buf_size)) {
goto fail; goto fail;
} }
if (module->types[type_idx1]->type_flag != WASM_TYPE_FUNC) { if (module->types[type_idx1] == NULL
|| module->types[type_idx1]->type_flag
!= WASM_TYPE_FUNC) {
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"unknown function type"); "unknown function type");
goto fail; goto fail;
@ -12694,7 +12704,9 @@ re_scan:
error_buf, error_buf_size)) { error_buf, error_buf_size)) {
goto fail; goto fail;
} }
if (module->types[type_idx]->type_flag != WASM_TYPE_FUNC) { if (module->types[type_idx] == NULL
|| module->types[type_idx]->type_flag
!= WASM_TYPE_FUNC) {
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"unknown function type"); "unknown function type");
goto fail; goto fail;
@ -14533,8 +14545,9 @@ re_scan:
error_buf_size)) { error_buf_size)) {
goto fail; goto fail;
} }
if (module->types[type_idx]->type_flag if (module->types[type_idx] == NULL
!= WASM_TYPE_STRUCT) { || module->types[type_idx]->type_flag
!= WASM_TYPE_STRUCT) {
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"unknown struct type"); "unknown struct type");
goto fail; goto fail;
@ -14620,8 +14633,9 @@ re_scan:
error_buf_size)) { error_buf_size)) {
goto fail; goto fail;
} }
if (module->types[type_idx]->type_flag if (module->types[type_idx] == NULL
!= WASM_TYPE_STRUCT) { || module->types[type_idx]->type_flag
!= WASM_TYPE_STRUCT) {
set_error_buf(error_buf, error_buf_size, set_error_buf(error_buf, error_buf_size,
"unknown struct type"); "unknown struct type");
goto fail; goto fail;