From 0907e8aafad5ca8cbbfde20eda64b08d2e4b22e6 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 11 Apr 2019 22:23:35 +0000 Subject: [PATCH] llvm-undname: Fix crash on invalid name in a template parameter pointer to member arg Found by oss-fuzz. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358234 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Demangle/MicrosoftDemangle.cpp | 2 ++ test/Demangle/invalid-manglings.test | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/lib/Demangle/MicrosoftDemangle.cpp b/lib/Demangle/MicrosoftDemangle.cpp index c649552051f..194a152acb8 100644 --- a/lib/Demangle/MicrosoftDemangle.cpp +++ b/lib/Demangle/MicrosoftDemangle.cpp @@ -2139,6 +2139,8 @@ Demangler::demangleTemplateParameterList(StringView &MangledName) { SymbolNode *S = nullptr; if (MangledName.startsWith('?')) { S = parse(MangledName); + if (Error) + return nullptr; memorizeIdentifier(S->Name->getUnqualifiedIdentifier()); } diff --git a/test/Demangle/invalid-manglings.test b/test/Demangle/invalid-manglings.test index 40bf92df357..5d6f3160a95 100644 --- a/test/Demangle/invalid-manglings.test +++ b/test/Demangle/invalid-manglings.test @@ -94,3 +94,8 @@ ; CHECK-EMPTY: ; CHECK-NEXT: ??8@8 ; CHECK-NEXT: error: Invalid mangled name + +?B@?$?K$H? +; CHECK-EMPTY: +; CHECK-NEXT: ?B@?$?K$H? +; CHECK-NEXT: error: Invalid mangled name -- 2.50.1