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

Merge remote-tracking branch 'origin/GP-3073_fixNPEInListing'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-02-02 11:07:32 -05:00
parent a02337866c 1ffbcb422a
commit f022b9a4d5
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
+2 -1
View File
@@ -768,7 +768,8 @@ public class DebuggerListingProvider extends CodeViewerProvider {
if (gotoProgram != getProgram()) {
doSetProgram(gotoProgram);
}
if (!gotoProgram.getMemory().contains(location.getAddress())) {
if (gotoProgram == null ||
!gotoProgram.getMemory().contains(location.getAddress())) {
return false;
}
if (super.goTo(gotoProgram, location)) {
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProviderTest.java
+14
View File
@@ -803,4 +803,18 @@ public class DebuggerWatchesProviderTest extends AbstractGhidraHeadedDebuggerGUI
assertTrue(LongLongDataType.dataType.isEquivalent(rRow0.getDataType()));
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);
}
}