diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Demangle/invalid-manglings.test | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index 13227381743..3fb8e0ec5c5 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -982,6 +982,7 @@ static uint8_t rebasedHexDigitToNumber(char C) { } uint8_t Demangler::demangleCharLiteral(StringView &MangledName) { + assert(!MangledName.empty()); if (!MangledName.startsWith('?')) return MangledName.popFront(); @@ -1248,7 +1249,7 @@ Demangler::demangleStringLiteral(StringView &MangledName) { // Encoded Length std::tie(StringByteSize, IsNegative) = demangleNumber(MangledName); - if (Error || IsNegative) + if (Error || IsNegative || StringByteSize < (IsWcharT ? 2 : 1)) goto StringLiteralError; // CRC 32 (always 8 characters plus a terminator) @@ -1269,7 +1270,7 @@ Demangler::demangleStringLiteral(StringView &MangledName) { Result->IsTruncated = true; while (!MangledName.consumeFront('@')) { - if (StringByteSize < 2) + if (MangledName.size() < 2) goto StringLiteralError; wchar_t W = demangleWcharLiteral(MangledName); if (StringByteSize != 2 || Result->IsTruncated) @@ -1286,7 +1287,7 @@ Demangler::demangleStringLiteral(StringView &MangledName) { unsigned BytesDecoded = 0; while (!MangledName.consumeFront('@')) { - if (StringByteSize < 1) + if (MangledName.size() < 1) goto StringLiteralError; StringBytes[BytesDecoded++] = demangleCharLiteral(MangledName); } diff --git a/llvm/test/Demangle/invalid-manglings.test b/llvm/test/Demangle/invalid-manglings.test index c4a75e3de20..ef37518e54a 100644 --- a/llvm/test/Demangle/invalid-manglings.test +++ b/llvm/test/Demangle/invalid-manglings.test @@ -149,3 +149,13 @@ ; CHECK-EMPTY: ; CHECK-NEXT: ??_C@_1A@01234567@a ; CHECK-NEXT: error: Invalid mangled name + +??_C@_0301234567@a +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_0301234567@a +; CHECK-NEXT: error: Invalid mangled name + +??_C@_1301234567@a +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_1301234567@a +; CHECK-NEXT: error: Invalid mangled name |
