From d49faf9e0f4fb281e67309e14afc86aec4e40e33 Mon Sep 17 00:00:00 2001 From: NapCat Date: Wed, 7 May 2025 20:43:44 +1000 Subject: [PATCH 1/3] Update android-lldb.sh, Fix #8115 --- .../data/debugger-launchers/android-lldb.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/android-lldb.sh b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/android-lldb.sh index 47395cff2e..4c8b2523e2 100755 --- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/android-lldb.sh +++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/android-lldb.sh @@ -56,14 +56,14 @@ if [ -z "$target_args" ] then argspart= else - argspart=-o "settings set target.run-args $target_args" + argspart=("-o" "settings set target.run-args $target_args") fi if [ -z "$OPT_ARCH" ] then archcmd= else - archcmd=-o "settings set target.default-arch $OPT_ARCH" + archcmd=("-o" "settings set target.default-arch $OPT_ARCH") fi "$OPT_LLDB_PATH" \ @@ -71,9 +71,9 @@ fi -o "script import ghidralldb" \ -o "platform select remote-android" \ -o "platform connect connect://$OPT_HOST:$OPT_PORT" \ - $archcmd \ + "${archcmd[@]}" \ -o "target create \"$target_image\"" \ - $argspart \ + "${argspart[@]}" \ -o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \ -o "ghidra trace start" \ -o "ghidra trace sync-enable" \ From 5d6cc2c98133c4908a89d23bdf922459289a24ae Mon Sep 17 00:00:00 2001 From: NapCat Date: Wed, 7 May 2025 20:44:15 +1000 Subject: [PATCH 2/3] Update kernel-lldb.sh, Fix #8115 --- .../data/debugger-launchers/kernel-lldb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/kernel-lldb.sh b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/kernel-lldb.sh index b07320a356..15d304377f 100755 --- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/kernel-lldb.sh +++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/kernel-lldb.sh @@ -46,13 +46,13 @@ if [ -z "$OPT_ARCH" ] then archcmd= else - archcmd=-o "settings set target.default-arch $OPT_ARCH" + archcmd=("-o" "settings set target.default-arch $OPT_ARCH") fi "$OPT_LLDB_PATH" \ -o "version" \ -o "script import ghidralldb" \ - $archcmd \ + "${archcmd[@]}" \ -o "kdp-remote $OPT_HOST" \ -o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \ -o "ghidra trace start" \ From bd2088dfedd7589a3307413833c288a067f72acc Mon Sep 17 00:00:00 2001 From: NapCat Date: Wed, 7 May 2025 20:44:59 +1000 Subject: [PATCH 3/3] Update local-lldb.sh, fix #8115 --- .../data/debugger-launchers/local-lldb.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/local-lldb.sh b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/local-lldb.sh index 397e0deea9..6998510a08 100755 --- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/local-lldb.sh +++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/local-lldb.sh @@ -55,14 +55,14 @@ if [ -z "$target_args" ] then argspart= else - argspart=-o "settings set target.run-args $target_args" + argspart=("-o" "settings set target.run-args $target_args") fi if [ -z "$TARGET_TTY" ] then ttypart= else - ttypart=-o "settings set target.output-path $TTY_TARGET" -o "settings set target.input-path $TTY_TARGET" + ttypart=("-o" "settings set target.output-path $TTY_TARGET" "-o" "settings set target.input-path $TTY_TARGET") fi if [ -z "$target_image" ] @@ -70,7 +70,7 @@ then "$OPT_LLDB_PATH" \ -o "version" \ -o "script import ghidralldb" \ - $ttypart \ + "${ttypart[@]}" \ -o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \ -o "ghidra trace start" \ -o "ghidra trace sync-enable" @@ -79,8 +79,8 @@ else -o "version" \ -o "script import ghidralldb" \ -o "target create \"$target_image\"" \ - $argspart \ - $ttypart \ + "${argspart[@]}" \ + "${ttypart[@]}" \ -o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \ -o "ghidra trace start" \ -o "ghidra trace sync-enable" \