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

Browse Source 
'origin/GP-3414_dev747368_dwarf_skip_bad_compunit' (Closes #5300)
This commit is contained in:
Ryan Kurtz
2023-05-11 06:38:28 -04:00
parent 0c9679f823 8766f89732
commit 5708d69834
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java
View File

@@ -15,9 +15,8 @@
*/
package ghidra.app.util.bin.format.dwarf4;
import java.util.*;
import java.io.IOException;
import java.util.*;
import ghidra.app.util.bin.BinaryReader;
import ghidra.app.util.bin.format.dwarf4.DWARFUtil.LengthResult;
@@ -344,15 +343,26 @@ public class DWARFCompilationUnit {
throws IOException, DWARFException, CancelledException {
BinaryReader br = dwarfProgram.getDebugInfo();
br.setPointerIndex(getFirstDIEOffset());
br.setPointerIndex(firstDIEOffset);
Deque<DebugInfoEntry> parentStack = new ArrayDeque<>();
DebugInfoEntry parent = null;
DebugInfoEntry die;
DebugInfoEntry unexpectedTerminator = null;
while ((br.getPointerIndex() < getEndOffset()) &&
(die = DebugInfoEntry.read(br, this, dwarfProgram.getAttributeFactory())) != null) {
while (br.getPointerIndex() < endOffset) {
long startOfDIE = br.getPointerIndex();
try {
die = DebugInfoEntry.read(br, this, dwarfProgram.getAttributeFactory());
}
catch (IOException e) {
Msg.error(this,
"Failed to read DIE at offset 0x%x in compunit %d (at 0x%x), skipping remainder of compilation unit."
.formatted(startOfDIE, compUnitNumber, startOffset),
e);
br.setPointerIndex(endOffset);
continue;
}
monitor.checkCancelled();
@@ -366,8 +376,8 @@ public class DWARFCompilationUnit {
}
if (unexpectedTerminator != null) {
throw new DWARFException("Unexpected terminator entry at " +
Long.toHexString(unexpectedTerminator.getOffset()));
throw new DWARFException("Unexpected terminator entry at 0x%x"
.formatted(unexpectedTerminator.getOffset()));
}
entries.add(die);
@@ -376,9 +386,9 @@ public class DWARFCompilationUnit {
die.setParent(parent);
}
else {
if (die.getOffset() != getFirstDIEOffset()) {
if (die.getOffset() != firstDIEOffset) {
throw new DWARFException(
"Unexpected root level DIE at " + Long.toHexString(die.getOffset()));
"Unexpected root level DIE at 0x%x".formatted(die.getOffset()));
}
}