Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-24 03:09:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3321_ryanmkurtz_python'

Browse Source 
(Closes #5215)
This commit is contained in:
Ryan Kurtz
2023-04-13 07:18:36 -04:00
parent 644d4f498f e9e408679d
commit d9e1031b65
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Python/src/main/java/ghidra/python/PythonPluginExecutionThread.java
+17 -26
View File
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.python.core.PyException;
import db.Transaction;
import generic.jar.ResourceFile;
import ghidra.app.script.GhidraState;
import ghidra.framework.plugintool.PluginTool;
@@ -59,26 +60,19 @@ class PythonPluginExecutionThread extends Thread {
Program program = plugin.getCurrentProgram();
// Setup transaction for the execution.
int transaction_number = -1;
if (program != null) {
transaction_number = program.startTransaction("Python command");
}
try (Transaction tx = program != null ? program.openTransaction("Python command") : null) {
// Setup Ghidra state to be passed into interpreter
interactiveTaskMonitor.clearCanceled();
interactiveScript.setSourceFile(new ResourceFile(new File("python")));
PluginTool tool = plugin.getTool();
interactiveScript.set(
new GhidraState(tool, tool.getProject(), program, plugin.getProgramLocation(),
plugin.getProgramSelection(), plugin.getProgramHighlight()),
interactiveTaskMonitor, new PrintWriter(plugin.getConsole().getStdOut()));
// Setup Ghidra state to be passed into interpreter
interactiveTaskMonitor.clearCanceled();
interactiveScript.setSourceFile(new ResourceFile(new File("python")));
PluginTool tool = plugin.getTool();
interactiveScript.set(
new GhidraState(tool, tool.getProject(), program, plugin.getProgramLocation(),
plugin.getProgramSelection(), plugin.getProgramHighlight()),
interactiveTaskMonitor, new PrintWriter(plugin.getConsole().getStdOut()));
// Execute the command
boolean commit = false;
moreInputWanted.set(false);
try {
// Execute the command
moreInputWanted.set(false);
moreInputWanted.set(plugin.getInterpreter().push(cmd, plugin.getInteractiveScript()));
commit = true;
}
catch (PyException pye) {
String exceptionName = PyException.exceptionClassName(pye.type);
@@ -86,20 +80,17 @@ class PythonPluginExecutionThread extends Thread {
plugin.reset();
}
else {
plugin.getConsole().getErrWriter().println("Suppressing exception: " +
PyException.exceptionClassName(pye.type));
plugin.getConsole()
.getErrWriter()
.println(
"Suppressing exception: " + PyException.exceptionClassName(pye.type));
}
}
catch (StackOverflowError soe) {
plugin.getConsole().getErrWriter().println("Stack overflow!");
}
finally {
// Re-get the current program in case the user closed the program while a long running
// command was executing.
program = plugin.getCurrentProgram();
if (program != null) {
program.endTransaction(transaction_number, commit);
}
interactiveScript.end(false); // end any transactions the script may have started
}
}
}