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

GP-4708 updated createStructure to fix logic error.

Browse source
This commit is contained in:
ghidra007 2024-06-24 22:57:15 +00:00 • committed by caheckman
parent 184c657cfd
commit 02aba11104
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java
View file

@ -498,16 +498,6 @@ public class RecoveredClass {
String fieldName = newComponent.getFieldName(); String fieldName = newComponent.getFieldName();
String comment = newComponent.getComment(); String comment = newComponent.getComment();
// if it is any empty placeholder structure - replace with
// undefined1 dt
if (newComponentDataType instanceof Structure &&
newComponentDataType.isNotYetDefined()) {
computedClassStructure.replaceAtOffset(offset, new Undefined1DataType(), 1,
fieldName, comment);
continue;
}
// if new component is an existing class data type pointer then replace current item // if new component is an existing class data type pointer then replace current item
// with a void pointer of same size if there is room // with a void pointer of same size if there is room
if (newComponentDataType instanceof Pointer && if (newComponentDataType instanceof Pointer &&
@ -529,8 +519,18 @@ public class RecoveredClass {
// if the new component is a non-empty structure, check to see if the current // if the new component is a non-empty structure, check to see if the current
// structure has undefined or equivalent components and replace with new struct if so // structure has undefined or equivalent components and replace with new struct if so
if (newComponentDataType instanceof Structure) { if (newComponentDataType instanceof Structure) {
// if new component is any empty placeholder structure AND if the existing component
// is undefined then replace with undefined1 dt
if (newComponentDataType.isNotYetDefined()) {
if (Undefined.isUndefined(currentComponentDataType)) {
computedClassStructure.replaceAtOffset(offset, new Undefined1DataType(), 1,
fieldName, comment);
}
continue;
}
if (EditStructureUtils.hasReplaceableComponentsAtOffset(computedClassStructure, if (EditStructureUtils.hasReplaceableComponentsAtOffset(computedClassStructure,
offset, (Structure) newComponentDataType, monitor)) { offset, (Structure)newComponentDataType, monitor)) {
boolean successfulClear = boolean successfulClear =
EditStructureUtils.clearLengthAtOffset(computedClassStructure, offset, EditStructureUtils.clearLengthAtOffset(computedClassStructure, offset,