diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java index 0d9ce2a3c9..11b5658c48 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java @@ -1206,6 +1206,9 @@ public class DebuggerListingProvider extends CodeViewerProvider { AddressSet set = new AddressSet(space.getMinAddress(), space.getMaxAddress()); Reqs reqs = Reqs.fromView(tool, view); + if (reqs == null) { + return; + } CurrentPlatformTraceDisassembleCommand dis = new CurrentPlatformTraceDisassembleCommand(tool, set, reqs, start); dis.run(tool, view); diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java index d8eff8c898..f2f3d695c0 100644 --- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java +++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java @@ -411,7 +411,9 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest GTree tree = modelProvider.objectsTreePanel.tree; GTreeNode node = waitForPass(() -> { GTreeNode n = Unique.assertOne(tree.getSelectedNodes()); - assertEquals("Processes@0", n.getName()); + assertEquals( + "Processes@%d".formatted(System.identityHashCode(processes.getCanonicalParent(0))), + n.getName()); return n; }); clickTreeNode(tree, node, MouseEvent.BUTTON1); @@ -822,7 +824,7 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest } waitForTasks(); - waitForPass(() -> assertEquals("Renamed Thread", node.getDisplayText())); + waitForPass(() -> assertEquals("Renamed Thread", node.getDisplayText())); } @Test