From 243fcec0309f6cba44daa86fdebde4db8df84ddb Mon Sep 17 00:00:00 2001
From: dev747368 <48332326+dev747368@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:16:37 +0000
Subject: [PATCH] GP-4946 fix NPE

---
 .../main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java
index 48a8098322..4b6557ab0a 100644
--- a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java
+++ b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java
@@ -77,7 +77,9 @@ public class GnuDemangler implements Demangler {
 	public DemangledObject demangle(MangledContext mangledContext)
 			throws DemangledException {
 		DemangledObject demangled = demangleInternal(mangledContext);
-		demangled.setMangledContext(mangledContext);
+		if (demangled != null) {
+			demangled.setMangledContext(mangledContext);
+		}
 		return demangled;
 	}