From f2d8f09d5d293e4e7aa060e65e41bf146a689cea Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Thu, 11 Apr 2019 22:23:35 +0000
Subject: llvm-undname: Fix crash on invalid name in a template parameter
 pointer to member arg

Found by oss-fuzz.

llvm-svn: 358234
---
 llvm/lib/Demangle/MicrosoftDemangle.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'llvm/lib')

diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp
index c649552051f..194a152acb8 100644
--- a/llvm/lib/Demangle/MicrosoftDemangle.cpp
+++ b/llvm/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());
       }
 
-- 
cgit v1.2.3