[PATCH] D60206: llvm-undname: Fix an assert-on-invalid

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL357648: llvm-undame: Fix an assert-on-invalid (authored by nico, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D60206?vs=193513&id=193626#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60206/new/

https://reviews.llvm.org/D60206

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


Index: llvm/trunk/test/Demangle/invalid-manglings.test
===================================================================
--- llvm/trunk/test/Demangle/invalid-manglings.test
+++ llvm/trunk/test/Demangle/invalid-manglings.test
@@ -19,3 +19,8 @@
 ; CHECK-EMPTY:
 ; CHECK-NEXT: ??
 ; CHECK-NEXT: error: Invalid mangled name
+
+??0@
+; CHECK-EMPTY:
+; CHECK-NEXT: ??0@
+; CHECK-NEXT: error: Invalid mangled name
Index: llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
===================================================================
--- llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
+++ llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
@@ -1389,9 +1389,12 @@
     return nullptr;
 
   if (Identifier->kind() == NodeKind::StructorIdentifier) {
+    if (QN->Components->Count < 2) {
+      Error = true;
+      return nullptr;
+    }
     StructorIdentifierNode *SIN =
         static_cast<StructorIdentifierNode *>(Identifier);
-    assert(QN->Components->Count >= 2);
     Node *ClassNode = QN->Components->Nodes[QN->Components->Count - 2];
     SIN->Class = static_cast<IdentifierNode *>(ClassNode);
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60206.193626.patch
Type: text/x-patch
Size: 1100 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190403/5af0add4/attachment.bin>