Skip to content

Add missing in_function_body check to objdump #2591

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 1 commit into from
Apr 25, 2025
Merged

Add missing in_function_body check to objdump #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/binary-reader-objdump.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,9 @@ Result BinaryReaderObjdumpDisassemble::OnOpcodeUint32(uint32_t value) {

Result BinaryReaderObjdumpDisassemble::OnOpcodeUint32Uint32(uint32_t value,
uint32_t value2) {
if (!in_function_body)
if (!in_function_body) {
return Result::Ok;
}
std::string_view name;
if (current_opcode == Opcode::MemoryInit &&
!(name = GetSegmentName(value)).empty()) {
Expand All @@ -813,6 +814,9 @@ Result BinaryReaderObjdumpDisassemble::OnOpcodeUint32Uint32(uint32_t value,
Result BinaryReaderObjdumpDisassemble::OnCallIndirectExpr(
uint32_t sig_index,
uint32_t table_index) {
if (!in_function_body) {
return Result::Ok;
}
std::string_view table_name = GetTableName(table_index);
std::string_view type_name = GetTypeName(sig_index);
if (!type_name.empty() && !table_name.empty()) {
Expand Down
20 changes: 20 additions & 0 deletions test/binary/bad-init-expr-callindirect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
;;; TOOL: run-objdump-gen-wasm
;;; ARGS1: -x
magic
version
section(GLOBAL) {
count[1]
type[i32] mut[0] init_expr[call_indirect 0 0 end]
}
(;; STDOUT ;;;

bad-init-expr-callindirect.wasm: file format wasm 0x1

Section Details:

Global[1]:
- global[0] i32 mutable=0 - init <INVALID>

Code Disassembly:

;;; STDOUT ;;)
Loading