Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 14:53:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-4291_ghidra1_PR-5784_astrelsky_ElfParseDynamicHeader'

Browse Source 
(Closes #5784)
This commit is contained in:
ghidra1
2024-02-01 17:54:46 -05:00
parent f9603007ff d7c854452b
commit 00afebac48
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfHeader.java
+9 -7
View File
@@ -702,15 +702,17 @@ public class ElfHeader implements StructConverter {
} }
ElfProgramHeader loadHeader = getProgramLoadHeaderContaining(vaddr); ElfProgramHeader loadHeader = getProgramLoadHeaderContaining(vaddr);
if (loadHeader != null) { if (loadHeader == null) {
long dynamicTableOffset = loadHeader.getOffset() + // Assume p_offset can be used reliably if no corresponding PT_LOAD
(dynamicHeaders[0].getVirtualAddress() - loadHeader.getVirtualAddress()); loadHeader = dynamicHeaders[0];
dynamicTable = new ElfDynamicTable(reader, this, dynamicTableOffset,
dynamicHeaders[0].getVirtualAddress());
return;
} }
long dynamicTableOffset = loadHeader.getOffset() +
(dynamicHeaders[0].getVirtualAddress() - loadHeader.getVirtualAddress());
dynamicTable = new ElfDynamicTable(reader, this, dynamicTableOffset,
dynamicHeaders[0].getVirtualAddress());
return;
} }
else if (dynamicHeaders.length > 1) { if (dynamicHeaders.length > 1) {
errorConsumer.accept("Multiple ELF Dynamic table program headers found"); errorConsumer.accept("Multiple ELF Dynamic table program headers found");
} }