From 0234da5db59493c9c3e1fae3c71dadd6f4e882af Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Mon, 29 Sep 2025 09:42:53 -0400
Subject: [PATCH] GP-1 Correct NPE with symbol filter restore

---
 .../java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java
index 2cda64dea8..955b1fe30b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java
@@ -270,7 +270,9 @@ public class NewSymbolFilter implements SymbolFilter {
 		for (Element child : children) {
 			String childName = child.getAttributeValue(Filter.NAME_ATTRIBUTE);
 			Filter f = filterMap.get(childName);
-			f.restoreFromXml(child);
+			if (f != null) { // NOTE: filter definition may have been dropped and not found
+				f.restoreFromXml(child);
+			}
 		}
 
 		rebuildActiveFilters();