diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/Demangle/ms-string-literals.test | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index b421f2a7f93..01a742a874e 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -1071,17 +1071,17 @@ static void outputHex(OutputStream &OS, unsigned C) { char TempBuffer[17]; ::memset(TempBuffer, 0, sizeof(TempBuffer)); - constexpr int MaxPos = 15; + constexpr int MaxPos = sizeof(TempBuffer) - 1; - int Pos = MaxPos - 1; + int Pos = MaxPos - 1; // TempBuffer[MaxPos] is the terminating \0. while (C != 0) { for (int I = 0; I < 2; ++I) { writeHexDigit(&TempBuffer[Pos--], C % 16); C /= 16; } TempBuffer[Pos--] = 'x'; - TempBuffer[Pos--] = '\\'; assert(Pos >= 0); + TempBuffer[Pos--] = '\\'; } OS << StringView(&TempBuffer[Pos + 1]); } diff --git a/llvm/test/Demangle/ms-string-literals.test b/llvm/test/Demangle/ms-string-literals.test index 2fe3384fe74..7ba6b48e6ae 100644 --- a/llvm/test/Demangle/ms-string-literals.test +++ b/llvm/test/Demangle/ms-string-literals.test @@ -781,3 +781,13 @@ ??_C@_0CC@MBPKDIAM@a?$AA?$AA?$AAb?$AA?$AA?$AAc?$AA?$AA?$AAd?$AA?$AA?$AAe?$AA?$AA?$AAf?$AA?$AA?$AAg?$AA?$AA?$AAh?$AA?$AA?$AA@ ; CHECK: u"a\0b\0c\0d\0e\0f\0g\0h\0"... + +; This is technically not a valid u32 string since the character in it is not +; <= 0x10FFFF like unicode demands. (Also, the crc doesn't match the contents.) +; It's here because this input used to cause a stack overflow in outputHex(). + +; FIXME: The demangler currently writes for \x codes for a single U string +; character. That's incorrect since that would mangle two four characters. + +??_C@_07LJGFEJEB@D3?$CC?$BB?$AA?$AA?$AA?$AA@) +; CHECK: U"\x11\x22\x33\x44" |
