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

Merge remote-tracking branch 'origin/GP-0_d-millar_fix_for_dup_wait' into Ghidra_11.1

Browse source
This commit is contained in:
Ryan Kurtz 2024-05-24 12:50:51 -04:00
commit 221034599d
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/arch.py
View file

@ -57,7 +57,7 @@ def get_arch():
try: try:
type = util.dbg.get_actual_processor_type() type = util.dbg.get_actual_processor_type()
except Exception: except Exception:
print("Error getting actual processor type.") #print("Error getting actual processor type.")
return "Unknown" return "Unknown"
if type is None: if type is None:
return "x86_64" return "x86_64"

1
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
View file

@ -257,7 +257,6 @@ def ghidra_trace_create(command=None, initial_break=True, timeout=DbgEng.WAIT_IN
dbg._client.CreateProcess(command, DbgEng.DEBUG_PROCESS) dbg._client.CreateProcess(command, DbgEng.DEBUG_PROCESS)
if initial_break: if initial_break:
dbg._control.AddEngineOptions(DbgEng.DEBUG_ENGINITIAL_BREAK) dbg._control.AddEngineOptions(DbgEng.DEBUG_ENGINITIAL_BREAK)
dbg.wait(timeout)
if start_trace: if start_trace:
ghidra_trace_start(command) ghidra_trace_start(command)

2
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py
View file

@ -201,7 +201,7 @@ def on_debuggee_changed(*args):
@log_errors @log_errors
def on_session_status_changed(*args): def on_session_status_changed(*args):
print("ON_STATUS_CHANGED: args={}".format(args)) # print("ON_STATUS_CHANGED: args={}".format(args))
trace = commands.STATE.trace trace = commands.STATE.trace
if trace is None: if trace is None:
return return

3
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/util.py
View file

@ -455,7 +455,8 @@ def selected_process():
return dbg._base._systems.GetCurrentProcessSystemId() return dbg._base._systems.GetCurrentProcessSystemId()
return dbg._base._systems.GetCurrentProcessId() return dbg._base._systems.GetCurrentProcessId()
except exception.E_UNEXPECTED_Error: except exception.E_UNEXPECTED_Error:
return None # NB: we're intentionally returning 0 instead of None
return 0
@dbg.eng_thread @dbg.eng_thread