commit 31677fc421f7b86d7e3937a7de7d4352f6e5f4a1
author David Blaikie <dblaikie@gmail.com> Wed Mar 30 20:18:40 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Mar 30 13:34:01 2022 -0700
tree 2ced484d66e7736d04cf0e5031b6ce462c38f67c
parent 0a4dca8199257d5e7e1a30f7289d17fdda486856

Demangle: Fix crash-on-invalid demangling of a module name with no underlying entity

GitOrigin-RevId: 6f5ecd089f77e0da9af44bb7211ad1b11ea582d4

src/demangle/ItaniumDemangle.h

diff --git a/src/demangle/ItaniumDemangle.h b/src/demangle/ItaniumDemangle.h
index be2cf88..a434868 100644
--- a/src/demangle/ItaniumDemangle.h
+++ b/src/demangle/ItaniumDemangle.h
@@ -2885,7 +2885,7 @@
     Result = getDerived().parseOperatorName(State);
   }
 
-  if (Module)
+  if (Result != nullptr && Module != nullptr)
     Result = make<ModuleEntity>(Module, Result);
   if (Result != nullptr)
     Result = getDerived().parseAbiTags(Result);

test/test_demangle.pass.cpp

diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index a0d9bad..916fda6 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -30172,6 +30172,7 @@
     "_ZWDC3FOOEv",
     "_ZGI3Foo",
     "_ZGIW3Foov",
+    "W1x",
 };
 
 const unsigned NI = sizeof(invalid_cases) / sizeof(invalid_cases[0]);