yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_11.4'

Browse source
This commit is contained in:
Ryan Kurtz 2025-05-28 14:59:46 -04:00
commit 5e17903c66
6 changed files with 139 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java
View file

@ -2933,15 +2933,11 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
if (allowsDefaultBuiltInSettings() &&
builtInDt.getSettingsDefinitions().length != 0) {
// Alter built-in datatype instance to use new DB-backed default settings which
// facilitates user adjustments to the original default settings.
DataTypeSettingsDB settings =
new DataTypeSettingsDB(this, builtInDt, dataTypeID);
if (builtInDt instanceof TypeDef) {
// Copy default immutable builtin typedef settings
Settings typedefSettings = builtInDt.getDefaultSettings();
for (String n : typedefSettings.getNames()) {
settings.setValue(n, typedefSettings.getValue(n));
}
}
settings.setDefaultSettings(builtInDt.getDefaultSettings());
settings.setAllowedSettingPredicate(n -> isBuiltInSettingAllowed(builtInDt, n));
builtInDt.setDefaultSettings(settings);
}