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

GP-822: Fixed issue with GDB when launched process terminates immediately.

Browse source
This commit is contained in:
Dan 2021-04-01 13:37:30 -04:00
parent fcc0d97ae0
commit cac43030eb
5 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
View file

@ -70,7 +70,8 @@ public class GdbManagerImpl implements GdbManager {
CLI, MI2;
}
private static final boolean LOG_IO = true;
private static final boolean LOG_IO =
Boolean.parseBoolean(System.getProperty("agent.gdb.manager.log"));
private static final PrintWriter DBG_LOG;
static {
if (LOG_IO) {
@ -838,7 +839,7 @@ public class GdbManagerImpl implements GdbManager {
throw new RuntimeException("GDB gave an unrecognized response", e);
}
catch (IllegalArgumentException e) {
Msg.warn(this, e.getMessage());
Msg.warn(this, "Error processing GDB output", e);
}
}
}

5
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/cmd/GdbGetThreadInfoCommand.java
View file

@ -36,6 +36,11 @@ public class GdbGetThreadInfoCommand extends AbstractGdbCommandWithThreadId<GdbT
return "-thread-info " + threadId; // Note the trailing space
}
@Override
public Integer impliesCurrentThreadId() {
return null;
}
@Override
public boolean handle(GdbEvent<?> evt, GdbPendingCommand<?> pending) {
if (evt instanceof AbstractGdbCompletedCommandEvent) {

28
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetInferior.java
View file

@ -222,20 +222,34 @@ public class GdbModelTargetInferior
protected CompletableFuture<Void> inferiorStarted(Long pid) {
parent.getListeners().fire.event(
parent, null, TargetEventType.PROCESS_CREATED, "Inferior " + inferior.getId() +
" started " + inferior.getExecutable() + " pid=" + inferior.getPid(),
" started " + inferior.getExecutable() + " pid=" + pid,
List.of(this));
AsyncFence fence = new AsyncFence();
fence.include(modules.refreshInternal());
//fence.include(registers.refreshInternal());
fence.include(environment.refreshInternal());
fence.include(impl.gdb.listInferiors()); // HACK to update inferior.getExecutable()
// NB. Hack also updates inferior.getPid(), so ignore pid parameter
return fence.ready().thenAccept(__ -> {
changeAttributes(List.of(),
Map.ofEntries(Map.entry(STATE_ATTRIBUTE_NAME, state = realState),
Map.entry(PID_ATTRIBUTE_NAME, inferior.getPid()),
Map.entry(DISPLAY_ATTRIBUTE_NAME, updateDisplay())),
"Refresh on started");
// NB. Hack also updates inferior.getPid()
Long p = pid;
if (p == null) {
// Might have become null if it quickly terminates
// Also, we should save it before waiting on the refresh
p = inferior.getPid();
}
if (p == null) {
changeAttributes(List.of(),
Map.ofEntries(Map.entry(STATE_ATTRIBUTE_NAME, state = realState),
Map.entry(DISPLAY_ATTRIBUTE_NAME, updateDisplay())),
"Refresh on started");
}
else {
changeAttributes(List.of(),
Map.ofEntries(Map.entry(STATE_ATTRIBUTE_NAME, state = realState),
Map.entry(PID_ATTRIBUTE_NAME, p),
Map.entry(DISPLAY_ATTRIBUTE_NAME, updateDisplay())),
"Refresh on started");
}
});
}