maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-undname: Fix two more asserts-on-invalid, found by oss-fuzz 

llvm-svn: 358708
This commit is contained in:
Nico Weber 2019-04-18 19:52:32 +00:00
parent 502cf4bd19
commit a0ac65c98f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Demangle/MicrosoftDemangle.cpp
View File

@ -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);
}

10
llvm/test/Demangle/invalid-manglings.test
View File

@ -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