From fdf1c04e2cdc7e82d9e5255eab456f377152cda5 Mon Sep 17 00:00:00 2001 From: d-millar <33498836+d-millar@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:59:00 -0500 Subject: [PATCH] GP-2614: from review GP-2614: minor fix --- .../launcher/AbstractScriptTraceRmiLaunchOffer.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/AbstractScriptTraceRmiLaunchOffer.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/AbstractScriptTraceRmiLaunchOffer.java index 64dfc131c2..d3851415aa 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/AbstractScriptTraceRmiLaunchOffer.java +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/AbstractScriptTraceRmiLaunchOffer.java @@ -28,6 +28,7 @@ import ghidra.debug.api.tracermi.LaunchParameter; import ghidra.debug.api.tracermi.TerminalSession; import ghidra.program.model.listing.Program; import ghidra.util.HelpLocation; +import ghidra.util.Msg; import ghidra.util.task.TaskMonitor; public abstract class AbstractScriptTraceRmiLaunchOffer extends AbstractTraceRmiLaunchOffer { @@ -107,6 +108,13 @@ public abstract class AbstractScriptTraceRmiLaunchOffer extends AbstractTraceRmi Map env = new HashMap<>(System.getenv()); prepareSubprocess(commandLine, env, args, address); if (program != null) { + LaunchParameter imageParameter = imageParameter(); + if (imageParameter != null) { + ValStr valStr = args.get(imageParameter.name()); + if (valStr != null && !valStr.str().contains(program.getName())) { + Msg.warn(this, "Possible mismatch for " + program.getName() + ": " + valStr.str()); + } + } env.put("GHIDRA_LANGUAGE_ID", program.getLanguageID().toString()); }