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

Merge remote-tracking branch

Browse Source 
'origin/GP-5412_ghidra1_StructureEditorTransactionError' into patch
(Closes #7853)
This commit is contained in:
Ryan Kurtz
2025-02-25 07:00:44 -05:00
parent de95e7e4a9 0fc1805695
commit f6671b7c21
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java
View File

@@ -1119,17 +1119,8 @@ class StructureEditorModel extends CompEditorModel {
} }
DataTypeManager originalDtm = getOriginalDataTypeManager(); DataTypeManager originalDtm = getOriginalDataTypeManager();
String baseName = "struct";
CategoryPath originalCategoryPath = getOriginalCategoryPath(); CategoryPath originalCategoryPath = getOriginalCategoryPath();
String uniqueName = viewDTM.getUniqueName(originalCategoryPath, baseName); String uniqueName = getUniqueDataTypeName(originalCategoryPath, "struct");
DataType conflictingDt = originalDtm.getDataType(originalCategoryPath, uniqueName);
while (conflictingDt != null) {
// pull the data type into the view data type manager with the conflicting name.
viewDTM.resolve(conflictingDt, DataTypeConflictHandler.DEFAULT_HANDLER);
// Try to get another unique name.
uniqueName = viewDTM.getUniqueName(originalCategoryPath, baseName);
conflictingDt = originalDtm.getDataType(originalCategoryPath, uniqueName);
}
String specifiedName = String specifiedName =
showNameDialog(uniqueName, originalCategoryPath, viewComposite.getName(), originalDtm); showNameDialog(uniqueName, originalCategoryPath, viewComposite.getName(), originalDtm);
@@ -1148,6 +1139,39 @@ class StructureEditorModel extends CompEditorModel {
}); });
} }
/**
* Get a unique datatype name. Method based on the logic used by
* {@link DataTypeManager#getUniqueName(CategoryPath, String)} but
* checks both the original and view DTMs for uniqueness.
* @param path category path
* @param baseName datatype name
* @return unique datatype name
*/
private String getUniqueDataTypeName(CategoryPath path, String baseName) {
int pos = baseName.lastIndexOf('_');
int oneUpNumber = 0;
String name = baseName;
if (pos > 0) {
String numString = baseName.substring(pos + 1);
try {
oneUpNumber = Integer.parseInt(numString);
name = baseName;
baseName = baseName.substring(0, pos);
}
catch (NumberFormatException e) {
// the number will get updated below
}
}
DataTypeManager originalDtm = getOriginalDataTypeManager();
// Pick a name not used within either original or view DTM
while (originalDtm.getDataType(path, name) != null ||
viewDTM.getDataType(path, name) != null) {
++oneUpNumber;
name = baseName + "_" + oneUpNumber;
}
return name;
}
private void doCreateInternalStructure(DataTypeManager dtm, CategoryPath categoryPath, private void doCreateInternalStructure(DataTypeManager dtm, CategoryPath categoryPath,
String name, TaskMonitor monitor) throws InvalidDataTypeException, UsrException { String name, TaskMonitor monitor) throws InvalidDataTypeException, UsrException {