mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

fix for isInstance/isStopped failure caused by DTO:gateFuture

Browse Source
This commit is contained in:
d-millar
2021-02-23 11:47:24 -05:00
parent 214e058488
commit dd37995833
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
View File

@@ -21,6 +21,7 @@ import java.awt.event.MouseEvent;
import java.lang.invoke.MethodHandles;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import javax.swing.*;
@@ -827,7 +828,14 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
if (isLocalOnly()) {
return clazz.isInstance(object);
}
TargetObject result = DebugModelConventions.findSuitable(clazz, object).getNow(null);
TargetObject result = null;
try {
result =
DebugModelConventions.findSuitable(clazz, object).get(100, TimeUnit.MILLISECONDS);
}
catch (Exception e) {
// IGNORE
}
return result != null;
}
@@ -1585,8 +1593,14 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
}
return false;
}
TargetObject result =
DebugModelConventions.findSuitable(TargetExecutionStateful.class, object).getNow(null);
TargetObject result = null;
try {
result = DebugModelConventions.findSuitable(TargetExecutionStateful.class, object)
.get(100, TimeUnit.MILLISECONDS);
}
catch (Exception e) {
// IGNORE
}
if (result != null) {
TargetExecutionStateful<?> stateful = (TargetExecutionStateful<?>) result;
TargetExecutionState executionState = stateful.getExecutionState();