Skip to content

wasm_loader allocates more spaces for elements #4099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 26, 2025
Merged

wasm_loader allocates more spaces for elements #4099

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acc1979
fix(wasm_loader): allocate memory for array initialization based on l…
lum1n0us Feb 22, 2025
fb28a38
fix(wasm_loader): update reference type mapping for struct initializa…
lum1n0us Feb 23, 2025
cc864dc
fix(wasm_loader): cast length value to uint64 for array initializatio…
lum1n0us Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,15 @@ destroy_init_expr_data_recursive(WASMModule *module, void *data)

if (wasm_type->type_flag == WASM_TYPE_STRUCT) {
WASMStructType *struct_type = (WASMStructType *)wasm_type;
WASMRefTypeMap *ref_type_map = struct_type->ref_type_maps;
WASMRefType *ref_type;
uint8 field_type;

uint16 ref_type_map_index = 0;
for (i = 0; i < struct_init_values->count; i++) {
field_type = struct_type->fields[i].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
ref_type = NULL;
if (wasm_reftype_is_subtype_of(field_type, ref_type,
Expand Down Expand Up @@ -1073,23 +1074,25 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
}

if (opcode1 == WASM_OP_ARRAY_NEW) {
WASMValue len_val;

if (!(array_init_values = loader_malloc(
sizeof(WASMArrayNewInitValues),
error_buf, error_buf_size))) {
goto fail;
}
array_init_values->type_idx = type_idx;
WASMValue len_val = { 0 };
uint64 size = 0;

if (!pop_const_expr_stack(
&const_expr_ctx, NULL, VALUE_TYPE_I32,
NULL, NULL, &len_val, error_buf,
error_buf_size)) {
destroy_init_expr_data_recursive(
module, array_init_values);
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;

if (!pop_const_expr_stack(
Expand Down
Loading