Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6452 fix NPE in rust demangler that caused log message spam

dev747368005ae2a7e656
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
index 927af23101..c87a41be09 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemangler.java
@@ -61,6 +61,10 @@ public class RustDemangler implements Demangler {
demangled = RustDemanglerV0.demangle(mangled);
}
+ if (demangled == null) {
+ return null;
+ }
+
RustDemanglerParser parser = new RustDemanglerParser();
DemangledObject demangledObject = parser.parse(mangled, demangled);