[PATCH] D60207: llvm-undname: Fix a crash-on-invalid

[Nico Weber via Phabricator via llvm-commits]

thakis created this revision.
thakis added a reviewer: zturner.
Herald added a subscriber: hiraditya.
Herald added a project: LLVM.

Found by oss-fuzz, fixes issue 13260 on oss-fuzz.


https://reviews.llvm.org/D60207

Files:
  llvm/lib/Demangle/MicrosoftDemangle.cpp
  llvm/test/Demangle/invalid-manglings.test


Index: llvm/test/Demangle/invalid-manglings.test
===================================================================
--- llvm/test/Demangle/invalid-manglings.test
+++ llvm/test/Demangle/invalid-manglings.test
@@ -24,3 +24,8 @@
 ; CHECK-EMPTY:
 ; CHECK-NEXT: ??0@
 ; CHECK-NEXT: error: Invalid mangled name
+
+? @@   YC@
+; CHECK-EMPTY:
+; CHECK-NEXT: ? @@   YC@
+; CHECK-NEXT: error: Invalid mangled name
Index: llvm/lib/Demangle/MicrosoftDemangle.cpp
===================================================================
--- llvm/lib/Demangle/MicrosoftDemangle.cpp
+++ llvm/lib/Demangle/MicrosoftDemangle.cpp
@@ -1949,7 +1949,7 @@
   for (uint64_t I = 0; I < Rank; ++I) {
     uint64_t D = 0;
     std::tie(D, IsNegative) = demangleNumber(MangledName);
-    if (IsNegative) {
+    if (Error || IsNegative) {
       Error = true;
       return nullptr;
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60207.193516.patch
Type: text/x-patch
Size: 858 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190403/00473c3c/attachment.bin>