From 09fb2029e5420e12a3f9c47d8c55b2d715df0e05 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 22 May 2019 15:53:23 +0000 Subject: llvm-undname: Fix an assert-on-invalid, found by oss-fuzz If a template parameter refers to a pointer to member, but the mangling of that was a string literal instead of a real symbol, llvm-undname used to crash instead of rejecting the input. llvm-svn: 361402 --- llvm/lib/Demangle/MicrosoftDemangle.cpp | 4 +++- llvm/test/Demangle/invalid-manglings.test | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'llvm') 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 -- cgit v1.2.3