Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-25 13:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-2939_dev747368_PR_690_fergofrog_fix_empty_DWARF_compunit'

Browse Source
This commit is contained in:
Ryan Kurtz 2019-06-20 08:02:11 -04:00
commit 13ae0b4c30
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,6 +148,7 @@ public class DWARFCompilationUnit {
else {
format = DWARF_32;
}
long endOffset = (debugInfoBR.getPointerIndex() + length);
short version = debugInfoBR.readNextShort();
long abbreviationOffset = DWARFUtil.readOffsetByDWARFformat(debugInfoBR, format);
@ -158,6 +159,14 @@ public class DWARFCompilationUnit {
throw new DWARFException(
"Only DWARF version 2, 3, or 4 information is currently supported.");
}
if (firstDIEOffset > endOffset) {
throw new IOException("Invalid length " + (endOffset - startOffset) +
" for DWARF Compilation Unit at 0x" + Long.toHexString(startOffset));
}
else if (firstDIEOffset == endOffset) {
// silently skip this empty compunit
return null;
}
debugAbbrBR.setPointerIndex(abbreviationOffset);
Map<Integer, DWARFAbbreviation> abbrMap =
@ -167,10 +176,10 @@ public class DWARFCompilationUnit {
new DWARFCompilationUnit(dwarfProgram, startOffset, endOffset, length, format, version,
abbreviationOffset, pointerSize, cuNumber, firstDIEOffset, abbrMap);
DebugInfoEntry compileUnitDIE =
DebugInfoEntry.read(debugInfoBR, cu, dwarfProgram.getAttributeFactory());
try {
DebugInfoEntry compileUnitDIE =
DebugInfoEntry.read(debugInfoBR, cu, dwarfProgram.getAttributeFactory());
DWARFCompileUnit compUnit = DWARFCompileUnit.read(
DIEAggregate.createSingle(compileUnitDIE), dwarfProgram.getDebugLine());
cu.setCompileUnit(compUnit);