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

GP-1136: Backporting to patch

Browse source
This commit is contained in:
dragonmacher 2021-07-14 17:04:08 -04:00 • committed by Ryan Kurtz
parent bb00438a62
commit b1aba1740c
7 changed files with 62 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java
View file

@ -22,6 +22,8 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import agent.dbgeng.gadp.impl.DbgEngGadpServerImpl;
import ghidra.dbg.agent.AgentWindow;
import ghidra.util.Msg;
@ -40,7 +42,13 @@ public interface DbgEngGadpServer extends AutoCloseable {
* @throws InterruptedException
*/
public static void main(String[] args) throws Exception {
new DbgEngRunner().run(args);
try {
new DbgEngRunner().run(args);
}
catch (Throwable t) {
System.err.println(ExceptionUtils.getMessage(t));
System.exit(1);
}
}
/**

6
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java
View file

@ -22,7 +22,13 @@ import agent.dbgeng.manager.DbgThread;
import agent.dbgeng.manager.impl.DbgManagerImpl;
import agent.dbgeng.model.iface2.*;
import ghidra.dbg.target.TargetObject;
import ghidra.dbg.target.schema.TargetAttributeType;
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
@TargetObjectSchemaInfo(
name = "Selectable",
attributes = {
@TargetAttributeType(type = Void.class) })
public interface DbgModelSelectableObject extends DbgModelTargetObject {
public default CompletableFuture<Void> setActive() {