[llvm] r357646 - llvm-undname: Fix a crash-on-invalid

[Nico Weber via llvm-commits]

Author: nico
Date: Wed Apr  3 16:15:56 2019
New Revision: 357646

URL: http://llvm.org/viewvc/llvm-project?rev=357646&view=rev
Log:
llvm-undname: Fix a crash-on-invalid

Found by oss-fuzz, fixes issues 12435 and 12438 on oss-fuzz.

Differential Revision: https://reviews.llvm.org/D60202

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

Modified: llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp?rev=357646&r1=357645&r2=357646&view=diff
==============================================================================
--- llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp (original)
+++ llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp Wed Apr  3 16:15:56 2019
@@ -1276,12 +1276,16 @@ StringLiteralError:
   return nullptr;
 }
 
+// Returns MangledName's prefix before the first '@', or an error if
+// MangledName contains no '@' or the prefix has length 0.
 StringView Demangler::demangleSimpleString(StringView &MangledName,
                                            bool Memorize) {
   StringView S;
   for (size_t i = 0; i < MangledName.size(); ++i) {
     if (MangledName[i] != '@')
       continue;
+    if (i == 0)
+      break;
     S = MangledName.substr(0, i);
     MangledName = MangledName.dropFront(i + 1);
 

Modified: llvm/trunk/test/Demangle/invalid-manglings.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Demangle/invalid-manglings.test?rev=357646&r1=357645&r2=357646&view=diff
==============================================================================
--- llvm/trunk/test/Demangle/invalid-manglings.test (original)
+++ llvm/trunk/test/Demangle/invalid-manglings.test Wed Apr  3 16:15:56 2019
@@ -8,4 +8,9 @@
 ?f0@@YAXPEU?$AS_@$00$$CAD at __clang@@@Z
 ; CHECK-EMPTY:
 ; CHECK-NEXT: ?f0@@YAXPEU?$AS_@$00$$CAD at __clang@@@Z
-; CHECK-NEXT: error: Invalid mangled name
\ No newline at end of file
+; CHECK-NEXT: error: Invalid mangled name
+
+?@@8
+; CHECK-EMPTY:
+; CHECK-NEXT: ?@@8
+; CHECK-NEXT: error: Invalid mangled name