mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-2618: Re-work script error handling

Browse Source
This commit is contained in:
Dan
2022-09-28 11:02:43 -04:00
parent deaf9b481f
commit 9235902820
7 changed files with 181 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Ghidra/Features/Python/src/main/java/ghidra/python/PythonScriptProvider.java
View File

@@ -19,8 +19,7 @@ import java.io.*;
import java.util.regex.Pattern;
import generic.jar.ResourceFile;
import ghidra.app.script.GhidraScript;
import ghidra.app.script.GhidraScriptProvider;
import ghidra.app.script.*;
public class PythonScriptProvider extends GhidraScriptProvider {
@@ -37,8 +36,11 @@ public class PythonScriptProvider extends GhidraScriptProvider {
}
/**
* Returns a Pattern that matches block comment openings.
* {@inheritDoc}
*
* <p>
* In Python this is a triple single quote sequence, "'''".
*
* @return the Pattern for Python block comment openings
*/
@Override
@@ -47,8 +49,11 @@ public class PythonScriptProvider extends GhidraScriptProvider {
}
/**
* Returns a Pattern that matches block comment closings.
* {@inheritDoc}
*
* <p>
* In Python this is a triple single quote sequence, "'''".
*
* @return the Pattern for Python block comment openings
*/
@Override
@@ -88,11 +93,16 @@ public class PythonScriptProvider extends GhidraScriptProvider {
@Override
public GhidraScript getScriptInstance(ResourceFile sourceFile, PrintWriter writer)
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
throws GhidraScriptLoadException {
Class<?> clazz = Class.forName(PythonScript.class.getName());
GhidraScript script = (GhidraScript) clazz.newInstance();
script.setSourceFile(sourceFile);
return script;
try {
Class<?> clazz = Class.forName(PythonScript.class.getName());
GhidraScript script = (GhidraScript) clazz.getConstructor().newInstance();
script.setSourceFile(sourceFile);
return script;
}
catch (Exception e) {
throw new GhidraScriptLoadException(e);
}
}
}