From: Nico Weber <nicolasweber@gmx.de>
Date: Sun, 21 Apr 2019 14:25:07 +0000 (+0000)
Subject: llvm-undname: Fix stack overflow on invalid found by oss-fuzz
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f10db760a40d4a76f7f9469d49110b45e4eab40;p=llvm

llvm-undname: Fix stack overflow on invalid found by oss-fuzz

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358852 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Demangle/MicrosoftDemangle.cpp b/lib/Demangle/MicrosoftDemangle.cpp
index 6431e4ab130..b421f2a7f93 100644
--- a/lib/Demangle/MicrosoftDemangle.cpp
+++ b/lib/Demangle/MicrosoftDemangle.cpp
@@ -1292,7 +1292,7 @@ Demangler::demangleStringLiteral(StringView &MangledName) {
 
     unsigned BytesDecoded = 0;
     while (!MangledName.consumeFront('@')) {
-      if (MangledName.size() < 1)
+      if (MangledName.size() < 1 || BytesDecoded >= MaxStringByteLength)
         goto StringLiteralError;
       StringBytes[BytesDecoded++] = demangleCharLiteral(MangledName);
     }
diff --git a/test/Demangle/invalid-manglings.test b/test/Demangle/invalid-manglings.test
index ef37518e54a..fb66c2b1cda 100644
--- a/test/Demangle/invalid-manglings.test
+++ b/test/Demangle/invalid-manglings.test
@@ -159,3 +159,8 @@
 ; CHECK-EMPTY:
 ; CHECK-NEXT: ??_C@_1301234567@a
 ; CHECK-NEXT: error: Invalid mangled name
+
+??_C@_0601234567@abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyz
+; CHECK-EMPTY:
+; CHECK-NEXT: ??_C@_0601234567@abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyz
+; CHECK-NEXT: error: Invalid mangled name