Fix potential unicode conversion issues for *nix #7506
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bogner
approved these changes
Sep 10, 2025
Comment on lines
+32
to
+33
| if (cbMultiByte == 0 || cbMultiByte < -1 || cbMultiByte > (INT32_MAX - 1) || | ||
| cchWideChar < 0 || cchWideChar > (INT32_MAX - 1)) { |
There was a problem hiding this comment.
Isn't cbMultiByte > (INT32_MAX - 1) equivalent to cbMultiByte == INT32_MAX? Unless we were to change cbMultiByte and cchWideChar to larger types I think the equality check is clearer, no?
|
Hello, I've tested this PR and it indeed fixes several test failure for me. However, I cannot get any output by running |
igaryhe
reviewed
Oct 11, 2025
| bool WideToEncodedString(const wchar_t *text, size_t cWide, DWORD cp, | ||
| DWORD flags, std::string *pValue, bool *lossy) { | ||
| DXASSERT_NOMSG(cWide == ~(size_t)0 || cWide < INT32_MAX); | ||
| if (text == nullptr || pValue == nullptr || cWide == 0 || cWide >= INT32_MAX) |
There was a problem hiding this comment.
Since cWide is set to ~(size_t)0 elsewhere, and this is guaranteed to be larger than INT32_MAX, so the last case seems a bit problematic.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were multiple issues with Unicode conversion on *nix platforms. This PR fixes issues I found with the conversion functions that were causing failures when running locally, due to issues with setting the locale. It also had incorrect behavior for emulating the MultiByteToWideChar API.
This change makes the local setting thread safe and more robust to different available locales in runtime environments.
I fixed some off-by-one issues related to null termination, and eliminated some extra copies caused by detecting a string length, then passing the size without the null-terminator to a function which then had to copy the input string again to guarantee null-termination.
The CompilerTest::CompileWithEncodeFlagTestSource test has minor updates for clarity and an added scenario.
The changed code passes the Unicode tests now without asserting across all platforms.
This change should have no functional impacts, except eliminating potential double-null-termination in some cases, and catching more error conditions.