Fix rename catch on external funcs (#97)

mahaloz · May 9, 2024 · 4cec397 · 4cec397
1 parent b919977
commit 4cec397
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/decomp2dbg/__init__.py b/decomp2dbg/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.9.0"
+__version__ = "3.9.1"
 
 try:
     from .clients.client import DecompilerClient

diff --git a/decompilers/d2d_ghidra/src/main/java/decomp2dbg/D2DGhidraServerAPI.java b/decompilers/d2d_ghidra/src/main/java/decomp2dbg/D2DGhidraServerAPI.java
@@ -121,6 +121,9 @@ public Map<String, Object> function_headers() {
 		var fm = program.getFunctionManager();
 		var functions = fm.getFunctions(true);
 		for (Function func : functions) {
+		    if(func == null)
+                continue;
+
 			Map<String, Object> funcInfo = new HashMap<>();
 			funcInfo.put("name", func.getName());
 			funcInfo.put("size", (int) func.getBody().getNumAddresses());

diff --git a/decompilers/d2d_ghidra/src/main/java/decomp2dbg/D2DPlugin.java b/decompilers/d2d_ghidra/src/main/java/decomp2dbg/D2DPlugin.java
@@ -362,6 +362,9 @@ else if(obj instanceof FunctionSymbol) {
 					var addr = sym.getAddress().getOffset();
 
 					var func = this.getCurrentProgram().getFunctionManager().getFunction(addr);
+					if(func == null)
+                        continue;
+
 					Map<String, Object> funcInfo = new HashMap<>();
 					funcInfo.put("name", newName);
 					funcInfo.put("size", (int) func.getBody().getNumAddresses());