From 36bdc556f0814208d0c7dcbae872093287543a48 Mon Sep 17 00:00:00 2001 From: d-millar <33498836+d-millar@users.noreply.github.com> Date: Mon, 10 Apr 2023 23:47:02 +0000 Subject: [PATCH] GP-0: fix for 'none' vs blank --- .../java/agent/dbgeng/DbgEngInJvmDebuggerModelFactory.java | 4 ++-- .../agent/dbgeng/gadp/DbgEngGadpDebuggerModelFactory.java | 4 ++-- .../agent/dbgmodel/DbgModelInJvmDebuggerModelFactory.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/DbgEngInJvmDebuggerModelFactory.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/DbgEngInJvmDebuggerModelFactory.java index 4961be1aa1..611803fdd2 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/DbgEngInJvmDebuggerModelFactory.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/DbgEngInJvmDebuggerModelFactory.java @@ -85,10 +85,10 @@ public class DbgEngInJvmDebuggerModelFactory implements DebuggerModelFactory { } protected void completeCommandLine(List cmd) { - if (!remote.equals("none")) { + if (!remote.equals("none") && !remote.equals("")) { cmd.addAll(List.of(remote)); } - if (!transport.equals("none")) { + if (!transport.equals("none") && !transport.equals("")) { cmd.addAll(List.of(transport)); } } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpDebuggerModelFactory.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpDebuggerModelFactory.java index facfe630ee..d570fa179b 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpDebuggerModelFactory.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpDebuggerModelFactory.java @@ -87,10 +87,10 @@ public class DbgEngGadpDebuggerModelFactory extends AbstractGadpLocalDebuggerMod cmd.addAll(List.of("-H", host)); cmd.addAll(List.of("-p", Integer.toString(port))); //cmd.addAll(List.of("-t", transport)); - if (!remote.equals("none")) { + if (!remote.equals("none") && !remote.equals("")) { cmd.addAll(List.of("-r", remote)); } - if (!transport.equals("none")) { + if (!transport.equals("none") && !transport.equals("")) { cmd.addAll(List.of("-t", transport)); } } diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/DbgModelInJvmDebuggerModelFactory.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/DbgModelInJvmDebuggerModelFactory.java index 5f8cb98ae3..08778e90eb 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/DbgModelInJvmDebuggerModelFactory.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/DbgModelInJvmDebuggerModelFactory.java @@ -83,10 +83,10 @@ public class DbgModelInJvmDebuggerModelFactory implements DebuggerModelFactory { } protected void completeCommandLine(List cmd) { - if (!remote.equals("none")) { + if (!remote.equals("none") && !remote.equals("")) { cmd.addAll(List.of(remote)); } - if (!transport.equals("none")) { + if (!transport.equals("none") && !transport.equals("")) { cmd.addAll(List.of(transport)); } }