Skip to content

Fix wrong condition in Memory64 data segment loading #4848

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

Closed
sumleo wants to merge 5 commits into from
Closed

Fix wrong condition in Memory64 data segment loading #4848

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73650c8
Fix wrong condition in Memory64 data segment loading
sumleo Feb 25, 2026
8d88072
Refactor Memory64 data segment flag check to use has_module_memory64
sumleo Feb 26, 2026
fc9feeb
Fix clang-format compliance in loader files
sumleo Feb 27, 2026
fe09cd8
Retrigger CI
sumleo Mar 1, 2026
b256520
Retrigger CI
sumleo Mar 2, 2026
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
2 changes: 1 addition & 1 deletion core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5159,7 +5159,7 @@ load_data_segment_section(const uint8 *buf, const uint8 *buf_end,
#if WASM_ENABLE_MEMORY64 != 0
/* This memory_flag is from memory instead of data segment */
uint8 memory_flag;
if (module->import_memory_count > 0) {
if (mem_index < module->import_memory_count) {
Copy link
Copy Markdown
Contributor

@TianlongLiang TianlongLiang Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better refactor this code snippet with has_module_memory64 instead, and modify the wasm_mini_loder.c too

Copy link
Copy Markdown
Contributor Author

@sumleo sumleo Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Replaced the manual import/defined memory flag lookup with has_module_memory64(module) in both wasm_loader.c and wasm_mini_loader.c.

memory_flag = module->import_memories[mem_index]
.u.memory.mem_type.flags;
}
Expand Down
Loading