Skip to content

WASM: give an error message if sections are in wrong order #1621

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 2 commits into from
Mar 25, 2023
Merged

WASM: give an error message if sections are in wrong order #1621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cda196
WASMDecoder: throw error when sectionId < expected
ubaidsk Mar 25, 2023
ce9d03f
WASMDecoder: Remove unused commented code
ubaidsk Mar 25, 2023
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
14 changes: 6 additions & 8 deletions src/libasr/codegen/wasm_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,41 +349,39 @@ class WASMDecoder {
"Expected: 0x00, 0x61, 0x73, 0x6D, 0x01, 0x00, 0x00, 0x00");
}
index += PREAMBLE_SIZE;
uint32_t expected_min_section_id = 1;
while (index < wasm_bytes.size()) {
uint32_t section_id = read_u32(wasm_bytes, index);
uint32_t section_size = read_u32(wasm_bytes, index);
if (section_id < expected_min_section_id) {
throw CodeGenError("DecodeWASM: Invalid sectionId, expected id >= "
+ std::to_string(expected_min_section_id));
}
expected_min_section_id = section_id + 1;
switch (section_id) {
case 1U:
decode_type_section(index);
// exit(0);
break;
case 2U:
decode_imports_section(index);
// exit(0);
break;
case 3U:
decode_function_section(index);
// exit(0);
break;
case 5U:
decode_memory_section(index);
// exit(0);
break;
case 6U:
decode_global_section(index);
// exit(0);
break;
case 7U:
decode_export_section(index);
// exit(0);
break;
case 10U:
decode_code_section(index);
// exit(0)
break;
case 11U:
decode_data_section(index);
// exit(0)
break;
default:
std::cout << "Unknown section id: " << section_id
Expand Down