Merge remote-tracking branch 'origin/GP-0_d-millar_fix_for_dup_wait' …

…into Ghidra_11.1
NationalSecurityAgency · May 24, 2024 · 2210345 · 2210345
2 parents 4aa0dc0 + 6ec3e4c
commit 2210345
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/arch.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/arch.py
@@ -57,7 +57,7 @@ def get_arch():
  try:
  type = util.dbg.get_actual_processor_type()
  except Exception:
- print("Error getting actual processor type.")
+ #print("Error getting actual processor type.")
  return "Unknown"
  if type is None:
  return "x86_64"

diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
@@ -257,7 +257,6 @@ def ghidra_trace_create(command=None, initial_break=True, timeout=DbgEng.WAIT_IN
  dbg._client.CreateProcess(command, DbgEng.DEBUG_PROCESS)
  if initial_break:
  dbg._control.AddEngineOptions(DbgEng.DEBUG_ENGINITIAL_BREAK)
- dbg.wait(timeout)
  if start_trace:
  ghidra_trace_start(command)
 

diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py
@@ -201,7 +201,7 @@ def on_debuggee_changed(*args):
 
 @log_errors
 def on_session_status_changed(*args):
- print("ON_STATUS_CHANGED: args={}".format(args))
+ # print("ON_STATUS_CHANGED: args={}".format(args))
  trace = commands.STATE.trace
  if trace is None:
  return

diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/util.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/util.py
@@ -455,7 +455,8 @@ def selected_process():
  return dbg._base._systems.GetCurrentProcessSystemId()
  return dbg._base._systems.GetCurrentProcessId()
  except exception.E_UNEXPECTED_Error:
- return None
+ # NB: we're intentionally returning 0 instead of None
+ return 0
 
 
 @dbg.eng_thread