From 4c8c6aedbd27bdd1ba9d3efbdd33e9bf22886cef Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 20 Oct 2023 07:02:50 -0400 Subject: [PATCH] GP-3885: Fixing follow-on issue discovered when testing a Swift binary --- .../java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java index 3906bd28b6..5a66637191 100644 --- a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java +++ b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java @@ -367,7 +367,7 @@ public class GnuDemanglerParser { // Note: this really is a 'special handler' check that used to be handled above. However, // some demangled operator strings begin with this text. If we do this check above, // then we will not correctly handle those operators. - if (mangledSource.startsWith("_ZZ")) { + if (mangledSource.startsWith("_ZZ") || mangledSource.startsWith("__ZZ")) { return new ItemInNamespaceHandler(demangled); }