yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1809_Dan_fixWatchesNoTraceNPE'

Browse source 
(#4059)
This commit is contained in:
Ryan Kurtz 2022-03-16 13:23:16 -04:00
commit 11be93b401
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -576,10 +576,14 @@ public class DebuggerWatchesProvider extends ComponentProviderAdapter {
} }
private ProgramLocation getDynamicLocation(ProgramLocation someLoc) { private ProgramLocation getDynamicLocation(ProgramLocation someLoc) {
TraceProgramView view = current.getView();
if (view == null) {
return null;
}
if (someLoc.getProgram() instanceof TraceProgramView) { if (someLoc.getProgram() instanceof TraceProgramView) {
return someLoc; return someLoc;
} }
return mappingService.getDynamicLocationFromStatic(current.getView(), someLoc); return mappingService.getDynamicLocationFromStatic(view, someLoc);
} }
private AddressSetView getDynamicAddresses(Program program, AddressSetView set) { private AddressSetView getDynamicAddresses(Program program, AddressSetView set) {