encounter
/
objdiff
mirror of https://github.com/encounter/objdiff.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relax symbol comparison logic 

The Ghidra delinker plugin emits functions with type STT_OBJECT,
rather than STT_FUNC. The current logic was preventing these from
being compared based on their symbol type. Relax this condition
for now.
This commit is contained in:
Luke Street 2024-10-29 22:46:02 -06:00
parent d2b7a9ef25
commit 21f8f2407c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
objdiff-core/src/diff/mod.rs
View File

@ -577,7 +577,7 @@ fn generate_mapping_symbols(
let Some(base_symbol_ref) = symbol_ref_by_name(base_obj, base_name) else { let Some(base_symbol_ref) = symbol_ref_by_name(base_obj, base_name) else {
return Ok(()); return Ok(());
}; };
let (base_section, base_symbol) = base_obj.section_symbol(base_symbol_ref); let (base_section, _base_symbol) = base_obj.section_symbol(base_symbol_ref);
let Some(base_section) = base_section else { let Some(base_section) = base_section else {
return Ok(()); return Ok(());
}; };
@ -588,9 +588,7 @@ fn generate_mapping_symbols(
for (target_section_index, target_section) in for (target_section_index, target_section) in
target_obj.sections.iter().enumerate().filter(|(_, s)| s.kind == base_section.kind) target_obj.sections.iter().enumerate().filter(|(_, s)| s.kind == base_section.kind)
{ {
for (target_symbol_index, _target_symbol) in for (target_symbol_index, _target_symbol) in target_section.symbols.iter().enumerate() {
target_section.symbols.iter().enumerate().filter(|(_, s)| s.kind == base_symbol.kind)
{
let target_symbol_ref = let target_symbol_ref =
SymbolRef { section_idx: target_section_index, symbol_idx: target_symbol_index }; SymbolRef { section_idx: target_section_index, symbol_idx: target_symbol_index };
match base_section.kind { match base_section.kind {