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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-11-17 10:40:32 -05:00
commit 3b2a20f0d3
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/breakpoint/DebuggerLogicalBreakpointServiceTest.java
View file

@ -1421,16 +1421,13 @@ public class DebuggerLogicalBreakpointServiceTest extends AbstractGhidraHeadedDe
LogicalBreakpoint lb = Unique.assertOne(breakpointService.getAllBreakpoints()); LogicalBreakpoint lb = Unique.assertOne(breakpointService.getAllBreakpoints());
// Simulate a step, which should also cause snap advance in recorder // Simulate a step, which should also cause snap advance in recorder
long oldSnap = recorder1.getSnap();
mb.testModel.session.simulateStep(mb.testThread1); mb.testModel.session.simulateStep(mb.testThread1);
waitOn(mb.testModel.flushEvents()); waitRecorder(recorder1);
// NB. recorder may have its own threads / queues
waitForPass(() -> assertTrue(recorder1.getSnap() > oldSnap));
waitOn(lb.delete()); waitOn(lb.delete());
waitForPass(() -> { waitForPass(() -> {
assertTrue(breakpointService.getAllBreakpoints().isEmpty()); assertEquals(0, breakpointService.getAllBreakpoints().size());
}); });
} }

4
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/InternalTraceObjectValue.java
View file

@ -149,6 +149,10 @@ interface InternalTraceObjectValue extends TraceObjectValue {
return getParent().doCreateValue(range, getEntryKey(), value); return getParent().doCreateValue(range, getEntryKey(), value);
} }
}.set(lifespan, getValue()); }.set(lifespan, getValue());
if (isObject()) {
DBTraceObject child = getChild();
child.emitEvents(new TraceChangeRecord<>(TraceObjectChangeType.LIFE_CHANGED, null, child));
}
} }
} }