llvm-undname: Fix another crash-on-invalid found by oss-fuzz

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358363 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Demangle/MicrosoftDemangle.cpp b/lib/Demangle/MicrosoftDemangle.cpp
index 719e716a8868d2376b083a68bad0733fa3f028f2..882913a98632fbc55972852fc401c69ceb47a6df 100644 (file)
--- a/lib/Demangle/MicrosoftDemangle.cpp
+++ b/lib/Demangle/MicrosoftDemangle.cpp
@@ -654,7 +654,10 @@ Demangler::translateIntrinsicFunctionCode(char CH,
 IdentifierNode *
 Demangler::demangleFunctionIdentifierCode(StringView &MangledName,
                                           FunctionIdentifierCodeGroup Group) {
-  assert(!MangledName.empty());
+  if (MangledName.empty()) {
+    Error = true;
+    return nullptr;
+  }
   switch (Group) {
   case FunctionIdentifierCodeGroup::Basic:
     switch (char CH = MangledName.popFront()) {

diff --git a/test/Demangle/invalid-manglings.test b/test/Demangle/invalid-manglings.test
index 473b3e4bbe15ce4ac229679f1deaf564d462bd77..eb22d1e0a4cbdf388b57a4fdbaf08a8e71878393 100644 (file)
--- a/test/Demangle/invalid-manglings.test
+++ b/test/Demangle/invalid-manglings.test
@@ -114,3 +114,8 @@
 ; CHECK-EMPTY:
 ; CHECK-NEXT: ??}
 ; CHECK-NEXT: error: Invalid mangled name
+
+?foo@?$?_
+; CHECK-EMPTY:
+; CHECK-NEXT: ?foo@?$?_
+; CHECK-NEXT: error: Invalid mangled name