diff options
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/Demangle/invalid-manglings.test | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index 719e716a886..882913a9863 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/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/llvm/test/Demangle/invalid-manglings.test b/llvm/test/Demangle/invalid-manglings.test index 473b3e4bbe1..eb22d1e0a4c 100644 --- a/llvm/test/Demangle/invalid-manglings.test +++ b/llvm/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 |
