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

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetMemoryPcodeExecutorState.java
This commit is contained in:
Ryan Kurtz 2021-08-31 12:51:51 -04:00
commit 50b48ae63b
13 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java
View file

@ -126,6 +126,9 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack {
else {
thread = manager.threadManager.getThread(threadSnap.threadKey);
frames.clear();
if (frameKeys == null) {
return;
}
for (long k : frameKeys) {
frames.add(manager.getFrameByKey(k));
}