christoph/wamr
1
Fork 0
Code Releases Activity

wasm_loader allocates more spaces for elements (#4099)

Browse Source 
- allocate memory for array initialization based on length
- update reference type mapping for struct initialization
This commit is contained in:
liang.he
2025-02-26 12:58:45 +08:00
committed by GitHub
parent 968b7d4ea0
commit f2e3348305
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,14 +513,15 @@ destroy_init_expr_data_recursive(WASMModule *module, void *data)
if (wasm_type->type_flag == WASM_TYPE_STRUCT) { if (wasm_type->type_flag == WASM_TYPE_STRUCT) {
WASMStructType *struct_type = (WASMStructType *)wasm_type; WASMStructType *struct_type = (WASMStructType *)wasm_type;
WASMRefTypeMap *ref_type_map = struct_type->ref_type_maps;
WASMRefType *ref_type; WASMRefType *ref_type;
uint8 field_type; uint8 field_type;
uint16 ref_type_map_index = 0;
for (i = 0; i < struct_init_values->count; i++) { for (i = 0; i < struct_init_values->count; i++) {
field_type = struct_type->fields[i].field_type; field_type = struct_type->fields[i].field_type;
if (wasm_is_type_multi_byte_type(field_type)) if (wasm_is_type_multi_byte_type(field_type))
ref_type = ref_type_map->ref_type; ref_type =
struct_type->ref_type_maps[ref_type_map_index++].ref_type;
else else
ref_type = NULL; ref_type = NULL;
if (wasm_reftype_is_subtype_of(field_type, ref_type, if (wasm_reftype_is_subtype_of(field_type, ref_type,
@ -1073,23 +1074,25 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
} }
if (opcode1 == WASM_OP_ARRAY_NEW) { if (opcode1 == WASM_OP_ARRAY_NEW) {
WASMValue len_val; WASMValue len_val = { 0 };
uint64 size = 0;
if (!(array_init_values = loader_malloc(
sizeof(WASMArrayNewInitValues),
error_buf, error_buf_size))) {
goto fail;
}
array_init_values->type_idx = type_idx;
if (!pop_const_expr_stack( if (!pop_const_expr_stack(
&const_expr_ctx, NULL, VALUE_TYPE_I32, &const_expr_ctx, NULL, VALUE_TYPE_I32,
NULL, NULL, &len_val, error_buf, NULL, NULL, &len_val, error_buf,
error_buf_size)) { error_buf_size)) {
destroy_init_expr_data_recursive(
module, array_init_values);
goto fail; goto fail;
} }
size =
sizeof(WASMArrayNewInitValues)
+ sizeof(WASMValue) * (uint64)len_val.i32;
if (!(array_init_values = loader_malloc(
size, error_buf, error_buf_size))) {
goto fail;
}
array_init_values->type_idx = type_idx;
array_init_values->length = len_val.i32; array_init_values->length = len_val.i32;
if (!pop_const_expr_stack( if (!pop_const_expr_stack(