Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6572: Forget breakoints using index rather than (possibly closed) trace.

Dan77d9ad7d9ea6
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServicePlugin.java
index 39fc24af5f..295ac707b3 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServicePlugin.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServicePlugin.java
@@ -486,12 +486,7 @@ public class DebuggerLogicalBreakpointServicePlugin extends Plugin
}
protected void forgetAllBreakpoints(RemoveCollector r) {
- Collection<TraceBreakpointLocation> toForget = new ArrayList<>();
- for (AddressRange range : trace.getBaseAddressFactory().getAddressSet()) {
- toForget.addAll(
- trace.getBreakpointManager().getBreakpointsIntersecting(Lifespan.ALL, range));
- }
- for (TraceBreakpointLocation tb : toForget) {
+ for (TraceBreakpointLocation tb : List.copyOf(logicalByBreakpoint.keySet())) {
forgetTraceBreakpoint(r, tb);
}
}