Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-26 16:45:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1442_Dan_fixNPEOnCancelLaunch'

Browse Source
This commit is contained in:
Ryan Kurtz
2021-11-09 10:53:16 -05:00
parent 6792beee6a 0fbb7f0dd6
commit 2c561c875b
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/launch/AbstractDebuggerProgramLaunchOffer.java
+13 -3
View File
@@ -26,6 +26,7 @@ import org.jdom.JDOMException;
import ghidra.app.plugin.core.debug.gui.objects.components.DebuggerMethodInvocationDialog;
import ghidra.app.plugin.core.debug.service.model.DebuggerModelServicePlugin;
import ghidra.app.services.DebuggerModelService;
import ghidra.async.AsyncUtils;
import ghidra.async.SwingExecutorService;
import ghidra.dbg.*;
import ghidra.dbg.target.TargetLauncher;
@@ -104,7 +105,7 @@ public abstract class AbstractDebuggerProgramLaunchOffer implements DebuggerProg
* Prompt the user for arguments, showing those last used or defaults
*
* @param params the parameters of the model's launcher
* @return the arguments given by the user
* @return the arguments given by the user, or null if cancelled
*/
protected Map<String, ?> promptLauncherArgs(Map<String, ParameterDescription<?>> params) {
DebuggerMethodInvocationDialog dialog =
@@ -118,6 +119,10 @@ public abstract class AbstractDebuggerProgramLaunchOffer implements DebuggerProg
}
}
args = dialog.promptArguments(params);
if (args == null) {
// Cancelled
return null;
}
saveLauncherArgs(args, params);
return args;
}
@@ -187,7 +192,7 @@ public abstract class AbstractDebuggerProgramLaunchOffer implements DebuggerProg
* be prompted to confirm.
*
* @param params the parameters of the model's launcher
* @return the chosen arguments
* @return the chosen arguments, or null if the user cancels at the prompt
*/
protected Map<String, ?> getLauncherArgs(Map<String, ParameterDescription<?>> params,
boolean prompt) {
@@ -279,7 +284,12 @@ public abstract class AbstractDebuggerProgramLaunchOffer implements DebuggerProg
monitor.incrementProgress(1);
monitor.setMessage("Launching");
TargetLauncher launcher = (TargetLauncher) l;
return launcher.launch(getLauncherArgs(launcher.getParameters(), prompt));
Map<String, ?> args = getLauncherArgs(launcher.getParameters(), prompt);
if (args == null) {
// Cancelled
return AsyncUtils.NIL;
}
return launcher.launch(args);
}).thenRun(() -> {
monitor.incrementProgress(1);
});