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

GT-3151 Correct PDB composite buildup error involving bitfields

Browse Source
This commit is contained in:
ghidra1
2019-09-12 17:09:07 -04:00
parent c1ae0d6971
commit 68108b088e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/DefaultCompositeMember.java
View File

@@ -1084,6 +1084,7 @@ class DefaultCompositeMember extends CompositeMember {
// must remove sibling bit fields at same offset but must leave
// first one behind to facilitate subsequent component swap.
boolean skipIfEqual = true;
int truncateOrdinal = -1;
for (DataTypeComponent component : parentStruct.getComponents()) {
int offset = component.getOffset();
if (offset >= memberOffset) {
@@ -1091,11 +1092,18 @@ class DefaultCompositeMember extends CompositeMember {
skipIfEqual = false;
}
else {
parentStruct.clearComponent(component.getOrdinal());
if (truncateOrdinal < 0) {
truncateOrdinal = component.getOrdinal();
}
parent.structureMemberOffsetMap.remove(offset);
}
}
}
if (truncateOrdinal >= 0) {
while (parentStruct.getNumComponents() > truncateOrdinal) {
parentStruct.delete(truncateOrdinal);
}
}
parent.structureMemberRangeMap.paintRange(memberOffset + getLength(), parent.getLength(),
-1);