diff options
| author | Shafik Yaghmour <shafik.yaghmour@intel.com> | 2025-04-07 13:18:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-07 13:18:53 -0700 |
| commit | d4c16424cf295e7edb7ecd5f8831ff195f7a8fa7 (patch) | |
| tree | 17b81809969b99268756ff0bf3cafd47ea36d260 | |
| parent | 7aedebac8cb473555aa8a2928ac3851b0142921e (diff) | |
| download | llvm-d4c16424cf295e7edb7ecd5f8831ff195f7a8fa7.zip llvm-d4c16424cf295e7edb7ecd5f8831ff195f7a8fa7.tar.gz llvm-d4c16424cf295e7edb7ecd5f8831ff195f7a8fa7.tar.bz2 | |
[LLVM][Demangle] Fix MS Demangler to be stricter about wide string literals (#134483)
Static analysis detected that Demangler::demangleStringLiteral had a
potential overflow if not checking StringByteSize properly.
Added check to ensure that for wide string it is always even and that
there were the byte count did not mismatch the actual size of the
literal.
Fixes: https://github.com/llvm/llvm-project/issues/129970
| -rw-r--r-- | llvm/docs/ReleaseNotes.md | 2 | ||||
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/Demangle/invalid-manglings.test | 24 |
3 files changed, 31 insertions, 0 deletions
diff --git a/llvm/docs/ReleaseNotes.md b/llvm/docs/ReleaseNotes.md index 58cf71b..526d6b4 100644 --- a/llvm/docs/ReleaseNotes.md +++ b/llvm/docs/ReleaseNotes.md @@ -70,6 +70,8 @@ Changes to LLVM infrastructure * Removed support for target intrinsics being defined in the target directories themselves (i.e., the `TargetIntrinsicInfo` class). +* Fix Microsoft demangling of string literals to be stricter + (#GH129970)) Changes to building LLVM ------------------------ diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index 6be8b0f..8d5f6b2 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -1374,6 +1374,11 @@ Demangler::demangleStringLiteral(std::string_view &MangledName) { Result->IsTruncated = true; while (!consumeFront(MangledName, '@')) { + // For a wide string StringByteSize has to have an even length. + if (StringByteSize % 2 != 0) + goto StringLiteralError; + if (StringByteSize == 0) + goto StringLiteralError; if (MangledName.size() < 2) goto StringLiteralError; wchar_t W = demangleWcharLiteral(MangledName); diff --git a/llvm/test/Demangle/invalid-manglings.test b/llvm/test/Demangle/invalid-manglings.test index b772884..5d80d2d 100644 --- a/llvm/test/Demangle/invalid-manglings.test +++ b/llvm/test/Demangle/invalid-manglings.test @@ -379,3 +379,27 @@ ; CHECK-EMPTY: ; CHECK-NEXT: .?AUBase@@@8 ; CHECK-NEXT: error: Invalid mangled name + +; Begin GH129970 + +??_C@_12EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_12EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-NEXT: error: Invalid mangled name + +??_C@_16EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_16EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-NEXT: error: Invalid mangled name + +??_C@_18EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_18EEHFKJGG@?$AAt?$AAe?$AAx@ +; CHECK-NEXT: error: Invalid mangled name + +??_C@_15EEHFKJGG@?$AAt?$AAe?$AAx?$AAx@ +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_15EEHFKJGG@?$AAt?$AAe?$AAx?$AAx@ +; CHECK-NEXT: error: Invalid mangled name + +; End GH129970 |