Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6359 Corrected UnionDB update notification to correct archive sync behavior. (Closes #8884)

ghidra192ee74fc3000
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/UnionDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/UnionDB.java
index a9d9d2f740..2bad384579 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/UnionDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/UnionDB.java
@@ -336,6 +336,9 @@ class UnionDB extends CompositeDB implements UnionInternal {
void doReplaceWith(UnionInternal union, boolean notify)
throws DataTypeDependencyException, IOException {
+ int oldAlignment = getAlignment();
+ int oldLength = unionLength;
+
// pre-resolved component types to catch dependency issues early
DataTypeComponent[] otherComponents = union.getComponents();
DataType[] resolvedDts = new DataType[otherComponents.length];
@@ -359,13 +362,21 @@ class UnionDB extends CompositeDB implements UnionInternal {
doAdd(resolvedDts[i], dtc.getLength(), dtc.getFieldName(), dtc.getComment(), false);
}
- record.setString(CompositeDBAdapter.COMPOSITE_COMMENT_COL, union.getDescription());
- compositeAdapter.updateRecord(record, false);
+ repack(false, false);
- repack(false, false); // updates timestamp
+ record.setString(CompositeDBAdapter.COMPOSITE_COMMENT_COL, union.getDescription());
+ compositeAdapter.updateRecord(record, true); // updates timestamp
if (notify) {
- notifySizeChanged(false); // assume size and/or alignment changed
+ if (unionLength != oldLength) {
+ notifySizeChanged(false);
+ }
+ else if (unionAlignment != oldAlignment) {
+ notifyAlignmentChanged(false);
+ }
+ else {
+ dataMgr.dataTypeChanged(this, false);
+ }
}
if (pointerPostResolveRequired) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java
index 5015d41eb5..5ff037ffba 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java
@@ -1237,7 +1237,7 @@ public class StructureDataType extends CompositeDataTypeImpl implements Structur
}
repack(false);
- notifySizeChanged();
+ notifySizeChanged(); // simplified assumption to force parents to update
}
private void doReplaceWithPacked(Structure struct) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/UnionDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/UnionDataType.java
index 966ae24949..d21431fc9b 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/UnionDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/UnionDataType.java
@@ -584,7 +584,7 @@ public class UnionDataType extends CompositeDataTypeImpl implements UnionInterna
}
repack(false);
- notifySizeChanged(); // assume size and/or alignment changed
+ notifySizeChanged(); // simplified assumption to force parents to update
}
@Override