llvm-undname: Fix crash on invalid name in a template parameter pointer to member arg

nico · nico · commit f2d8f09d5d29 · 2019-04-11T22:23:35.000Z
Found by oss-fuzz.

llvm-svn: 358234
diff --git 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());
       }
 
diff --git a/llvm/test/Demangle/invalid-manglings.test b/llvm/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

Original file line number	Diff line number	Diff line change
`@@ -2139,6 +2139,8 @@ Demangler::demangleTemplateParameterList(StringView &MangledName) {`
`2139`	`2139`	`SymbolNode *S = nullptr;`
`2140`	`2140`	`if (MangledName.startsWith('?')) {`
`2141`	`2141`	`S = parse(MangledName);`
	`2142`	`+ if (Error)`
	`2143`	`+ return nullptr;`
`2142`	`2144`	`memorizeIdentifier(S->Name->getUnqualifiedIdentifier());`
`2143`	`2145`	`}`
`2144`	`2146`