From 5a6b1ce29945bb03622c710b6b040d41bdf5fd07 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Fri, 3 Apr 2026 07:41:46 -0400 Subject: [PATCH] GP-6649 Corrected NPE with Project Data Type Archive upgrade --- .../program/database/ProjectDataTypeManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProjectDataTypeManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProjectDataTypeManager.java index 2d26cb5950..80bcc7d3c9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProjectDataTypeManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProjectDataTypeManager.java @@ -109,16 +109,16 @@ public class ProjectDataTypeManager extends StandAloneDataTypeManager @Override public void dataTypeChanged(DataType dt, boolean isAutoChange) { super.dataTypeChanged(dt, isAutoChange); -// dataTypeArchive.getCodeManager().invalidateCache(false); - // TODO - dataTypeArchive.dataTypeChanged(getID(dt), ProgramEvent.DATA_TYPE_CHANGED, isAutoChange, - null, dt); + // NOTE: During upgrades at time of instantiation dataTypeArchive will be null + if (dataTypeArchive != null) { + dataTypeArchive.dataTypeChanged(getID(dt), ProgramEvent.DATA_TYPE_CHANGED, isAutoChange, + null, dt); + } } @Override protected void dataTypeAdded(DataType newDt, DataType originalDataType) { super.dataTypeAdded(newDt, originalDataType); -// saveArchiveName(originalDataType); dataTypeArchive.dataTypeAdded(getID(newDt), ProgramEvent.DATA_TYPE_ADDED, null, newDt); }