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

GP-3073: Fixes NPE in Listing, while working GP-3046

Browse source
This commit is contained in:
Dan 2023-02-01 13:06:34 -05:00
parent db23383e5c
commit 1ffbcb422a
2 changed files with 16 additions and 1 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/listing/DebuggerListingProvider.java
View file

@ -747,7 +747,8 @@ public class DebuggerListingProvider extends CodeViewerProvider {
if (gotoProgram != getProgram()) { if (gotoProgram != getProgram()) {
doSetProgram(gotoProgram); doSetProgram(gotoProgram);
} }
if (!gotoProgram.getMemory().contains(location.getAddress())) { if (gotoProgram == null ||
!gotoProgram.getMemory().contains(location.getAddress())) {
return false; return false;
} }
if (super.goTo(gotoProgram, location)) { if (super.goTo(gotoProgram, location)) {

14
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProviderTest.java
View file

@ -803,4 +803,18 @@ public class DebuggerWatchesProviderTest extends AbstractGhidraHeadedDebuggerGUI
assertTrue(LongLongDataType.dataType.isEquivalent(rRow0.getDataType())); assertTrue(LongLongDataType.dataType.isEquivalent(rRow0.getDataType()));
assertEquals(FormatSettingsDefinition.DECIMAL, format.getChoice(rRow0.getSettings())); assertEquals(FormatSettingsDefinition.DECIMAL, format.getChoice(rRow0.getSettings()));
} }
@Test
public void testTraceClosure() throws Throwable {
setRegisterValues(thread);
watchesProvider.addWatch("r0");
watchesProvider.addWatch("*:8 r0");
traceManager.openTrace(tb.trace);
waitForSwing();
tb.close();
traceManager.activateThread(thread);
traceManager.closeTrace(tb.trace);
}
} }