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

GP-2387: Fix NPE when trying to sync while closing Debugger

Browse source
This commit is contained in:
Dan 2022-08-05 17:32:33 -04:00
parent 80d9d1dc88
commit 2640a07838
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/action/DebuggerStaticSyncTrait.java
View file

@ -196,7 +196,7 @@ public class DebuggerStaticSyncTrait {
} }
protected void doSyncCursorIntoStatic(ProgramLocation location) { protected void doSyncCursorIntoStatic(ProgramLocation location) {
if (location == null) { if (location == null || mappingService == null) {
return; return;
} }
ProgramLocation staticLoc = mappingService.getStaticLocationFromDynamic(location); ProgramLocation staticLoc = mappingService.getStaticLocationFromDynamic(location);
@ -208,7 +208,7 @@ public class DebuggerStaticSyncTrait {
protected void doSyncCursorFromStatic() { protected void doSyncCursorFromStatic() {
TraceProgramView view = current.getView(); // NB. Used for snap (don't want emuSnap) TraceProgramView view = current.getView(); // NB. Used for snap (don't want emuSnap)
if (view == null || currentStaticLocation == null) { if (view == null || currentStaticLocation == null || mappingService == null) {
return; return;
} }
ProgramLocation dynamicLoc = ProgramLocation dynamicLoc =
@ -246,7 +246,8 @@ public class DebuggerStaticSyncTrait {
} }
protected ProgramSelection doSyncSelectionIntoStatic(Program program, ProgramSelection sel) { protected ProgramSelection doSyncSelectionIntoStatic(Program program, ProgramSelection sel) {
if (program == null || sel == null || currentStaticProgram == null) { if (program == null || sel == null || currentStaticProgram == null ||
mappingService == null) {
return null; return null;
} }
TraceProgramView view = (TraceProgramView) program; TraceProgramView view = (TraceProgramView) program;
@ -269,7 +270,8 @@ public class DebuggerStaticSyncTrait {
protected ProgramSelection doSyncSelectionFromStatic() { protected ProgramSelection doSyncSelectionFromStatic() {
TraceProgramView view = current.getView(); TraceProgramView view = current.getView();
if (view == null || currentStaticProgram == null || currentStaticSelection == null) { if (view == null || currentStaticProgram == null || currentStaticSelection == null ||
mappingService == null) {
return null; return null;
} }
AddressSet mapped = AddressSet mapped =