Filter trivial functions

Dockerfile

@@ -27,7 +27,7 @@ RUN unzip ghidrathon/Ghidrathon-v4.0.0.zip -d /ghidra/Ghidra/Extensions
 
 WORKDIR /
 
-RUN git clone -b main https://github.com/edmcman/DIRTY # 09-21-24 2
+RUN git clone -b main https://github.com/edmcman/DIRTY # 09-23-24
 #ADD ./DIRTY /DIRTY
 
 RUN --mount=type=cache,target=/root/.cache pip install --upgrade -r /DIRTY/requirements.txt

main.py

@@ -10,10 +10,16 @@ def get_functions(file):
 
     with tempfile.TemporaryDirectory() as TEMP_DIR:
 
-        subprocess.run(
+        try:
+            output = subprocess.check_output(
             f"/ghidra/support/analyzeHeadless {TEMP_DIR} Project -import {file} -postscript /home/user/app/scripts/dump_functions.py {TEMP_DIR}/funcs.json",
             shell=True,
-        )
+            )
+        except Exception as e:
+            raise gr.Error(f"Unable to run Ghidra on {file}: {e}\n{output}")
+
+        if not os.path.exists(f"{TEMP_DIR}/funcs.json"):
+                raise gr.Error(f"DIRTY Ghidra failed to produce output: {output}")
 
         json_funcs = json.load(open(f"{TEMP_DIR}/funcs.json"))
 
@@ -32,9 +38,9 @@ with gr.Blocks() as demo:
     To get started, upload a binary or select one of the example binaries below.
 
     ## TODOs
-    * Filter out trivial functions
     * Avoid re-running Ghidra when changing the function
     * Make predictions for variables in non-unique storage locations
+    * Use JSON viewer for model output
     """
     )
 
@@ -127,8 +133,6 @@ with gr.Blocks() as demo:
 
         with tempfile.TemporaryDirectory() as TEMP_DIR:
 
-            print(selected_fun)
-
             progress(0, desc=f"Running DIRTY Ghidra on {hex(selected_fun)}...")
 
             try: