diff options
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Demangle/invalid-manglings.test | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index 4942e0e3655..041d327596b 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -2175,8 +2175,10 @@ Demangler::demangleTemplateParameterList(StringView &MangledName) { SymbolNode *S = nullptr; if (MangledName.startsWith('?')) { S = parse(MangledName); - if (Error) + if (Error || !S->Name) { + Error = true; return nullptr; + } memorizeIdentifier(S->Name->getUnqualifiedIdentifier()); } diff --git a/llvm/test/Demangle/invalid-manglings.test b/llvm/test/Demangle/invalid-manglings.test index d64ec4f14d4..6cd025a1eec 100644 --- a/llvm/test/Demangle/invalid-manglings.test +++ b/llvm/test/Demangle/invalid-manglings.test @@ -169,3 +169,8 @@ ; CHECK-EMPTY: ; CHECK-NEXT: ??_C@_12@?z ; CHECK-NEXT: error: Invalid mangled name + +??$foo@$1??_C@_02PCEFGMJL@hi?$AA@@ +; CHECK-EMPTY: +; CHECK-NEXT: ??$foo@$1??_C@_02PCEFGMJL@hi?$AA@@ +; CHECK-NEXT: error: Invalid mangled name |
