Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 00:15:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-dt-npe-hotfix' into Ghidra_10.0

Browse Source
This commit is contained in:
ghidra1
2021-06-04 14:23:51 -04:00
parent a3f3f7eb82 d0deeb9b88
commit 8c488aaacf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveNode.java
+4 -2
View File
@@ -78,8 +78,10 @@ public class ArchiveNode extends CategoryNode {
return; // some nodes do not have DataTypeManagers, like InvalidFileArchives return; // some nodes do not have DataTypeManagers, like InvalidFileArchives
} }
dataTypeManager.removeDataTypeManagerListener(listener); if (listener != null) {
listener.dispose(); dataTypeManager.removeDataTypeManagerListener(listener);
listener.dispose();
}
dataTypeManager = archive.getDataTypeManager(); dataTypeManager = archive.getDataTypeManager();
installDataTypeManagerListener(); installDataTypeManagerListener();