yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

PDB - corrected XML stack variable parse bug

Browse source
This commit is contained in:
ghidra1 2019-07-24 16:36:44 -04:00
parent b75a914b37
commit d8e9384d4f
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/ApplyStackVariables.java
View file

@ -65,6 +65,7 @@ class ApplyStackVariables {
DataType dt = getDataType(member, log); DataType dt = getDataType(member, log);
if (dt == null) { if (dt == null) {
xmlParser.next();//stack variable number end tag
continue; continue;
} }

6
Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/DefaultPdbMember.java
View file

@ -81,6 +81,7 @@ public class DefaultPdbMember extends PdbMember {
return null; return null;
} }
if (kind == PdbKind.MEMBER) { if (kind == PdbKind.MEMBER) {
// Strip bitfield data if present (see parseBitField method)
int bitFieldColonIndex = name.indexOf(':'); int bitFieldColonIndex = name.indexOf(':');
if (bitFieldColonIndex >= 0) { if (bitFieldColonIndex >= 0) {
return name.substring(0, bitFieldColonIndex); return name.substring(0, bitFieldColonIndex);
@ -118,7 +119,10 @@ public class DefaultPdbMember extends PdbMember {
} }
private void parseBitField(String name) { private void parseBitField(String name) {
int bitFieldColonIndex = name != null ? name.indexOf(':') : -1; if (name == null || kind != PdbKind.MEMBER) {
return;
}
int bitFieldColonIndex = name.indexOf(':');
if (bitFieldColonIndex >= 0) { if (bitFieldColonIndex >= 0) {
isBitField = true; isBitField = true;