Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions objdiff-core/src/arch/arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ impl Arch for ArchArm {
.disasm_modes
.get(&section_index)
.map(|x| x.as_slice())
.filter(|x| !x.is_empty())
.unwrap_or(&fallback_mappings);
let first_mapping_idx = mapping_symbols
.binary_search_by_key(&start_addr, |x| x.address)
Expand Down
19 changes: 19 additions & 0 deletions objdiff-core/tests/arch_arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,22 @@ fn trim_trailing_hword() {
let output = common::display_diff(&obj, &diff, symbol_idx, &diff_config);
insta::assert_snapshot!(output);
}

#[test]
#[cfg(feature = "arm")]
fn no_mapping_symbols_in_text() {
// A .text section that contains code bytes but is not covered by any
// mapping symbol must not panic while scanning instructions.
let diff_config = diff::DiffObjConfig::default();
let obj = obj::read::parse(
include_object!("data/arm/issue_352.o"),
&diff_config,
diff::DiffSide::Base,
)
.unwrap();
for (symbol_idx, symbol) in obj.symbols.iter().enumerate() {
if symbol.section.is_some() && symbol.size > 0 {
let _ = diff::code::no_diff_code(&obj, symbol_idx, &diff_config);
}
}
}
Binary file added objdiff-core/tests/data/arm/issue_352.o
Binary file not shown.
Loading