mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-13 11:40:02 -04:00
parent b275416021 b6c2699ab3
commit 4a232acbd6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfHeader.java
View File

@@ -992,6 +992,10 @@ public class ElfHeader implements StructConverter {
symCount = reader.readInt(symbolHashTableOffset + 4); // nchain from DT_HASH symCount = reader.readInt(symbolHashTableOffset + 4); // nchain from DT_HASH
} }
if (symCount == 0) {
return null;
}
// NOTE: When parsed from dynamic table and not found via section header parse // NOTE: When parsed from dynamic table and not found via section header parse
// it is assumed that the extended symbol section table is not used. // it is assumed that the extended symbol section table is not used.
@@ -1006,7 +1010,7 @@ public class ElfHeader implements StructConverter {
/** /**
* Walk DT_GNU_HASH table to determine dynamic symbol count * Walk DT_GNU_HASH table to determine dynamic symbol count
* @param gnuHashTableOffset DT_GNU_HASH table file offset * @param gnuHashTableOffset DT_GNU_HASH table file offset
* @return dynamic symbol count * @return dynamic symbol count (0 may be returned when processing error occurs)
* @throws IOException file read error * @throws IOException file read error
*/ */
private int deriveGnuHashDynamicSymbolCount(long gnuHashTableOffset) throws IOException { private int deriveGnuHashDynamicSymbolCount(long gnuHashTableOffset) throws IOException {
@@ -1059,22 +1063,21 @@ public class ElfHeader implements StructConverter {
} }
private long getMaxOffsetForLoadedRegionContaining(long offset, long minSize) { private long getMaxOffsetForLoadedRegionContaining(long offset, long minSize) {
long maxOffset = -1;
if (e_shnum != 0) { if (e_shnum != 0) {
ElfSectionHeader sectionContaining = ElfSectionHeader sectionContaining =
getSectionHeaderContainingFileRange(offset, minSize); getSectionHeaderContainingFileRange(offset, minSize);
if (sectionContaining != null) { if (sectionContaining != null) {
maxOffset = sectionContaining.getOffset() + sectionContaining.getSize() - 1; return sectionContaining.getOffset() + sectionContaining.getSize() - 1;
} }
} }
else { if (e_phnum != 0) {
ElfProgramHeader containingSegment = ElfProgramHeader containingSegment =
getProgramLoadHeaderContainingFileOffset(offset); getProgramLoadHeaderContainingFileOffset(offset);
if (containingSegment != null) { if (containingSegment != null) {
maxOffset = containingSegment.getOffset() + containingSegment.getFileSize() - 1; return containingSegment.getOffset() + containingSegment.getFileSize() - 1;
} }
} }
return maxOffset; return -1;
} }
/** /**