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/GP-5394_Dan_fixWatchDeref' into patch

Browse source
This commit is contained in:
Ryan Kurtz 2025-03-03 13:05:07 -05:00
commit c2533aaf6e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DefaultWatchRow.java
View file

@ -133,7 +133,14 @@ public class DefaultWatchRow implements WatchRow {
}
// Do not accidentally hang the Swing thread on evaluation
WatchValue fullValue = compiled.evaluate(executor);
byte[] prevValue = prevExec == null ? null : compiled.evaluate(prevExec);
byte[] prevValue;
try {
prevValue = prevExec == null ? null : compiled.evaluate(prevExec);
}
catch (Exception e) {
Msg.trace(this, "Error in evaluating previous value. Ignoring.", e);
prevValue = null;
}
synchronized (lock) {
if (executor != provider.asyncWatchExecutor) {
return;