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 'origin/GP-3718_Dan_fixWatchTypeNPE' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2023-08-09 13:13:01 -04:00
parent 2b41176a11 030fad284d
commit a5051f33dc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
View File

@@ -280,6 +280,9 @@ public class DebuggerWatchesProvider extends ComponentProviderAdapter
if (dataType == null) { if (dataType == null) {
return null; return null;
} }
if (currentTrace == null) {
return dataType;
}
try (Transaction tx = currentTrace.openTransaction("Resolve DataType")) { try (Transaction tx = currentTrace.openTransaction("Resolve DataType")) {
return currentTrace.getDataTypeManager().resolve(dataType, null); return currentTrace.getDataTypeManager().resolve(dataType, null);
} }