Fix incorrect string -> wstring conversion, causing utf16 corruption - #41406
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes UTF-16 corruption when formatting UTF-8 char strings into wide (wchar_t) formatted output by ensuring the wide-formatting formatter specializations use wide format strings.
Changes:
- Fix
std::formatter<... , wchar_t>specializations instringshared.hto useL"{}"(wide) instead of"{}"(narrow) when writing to a wide format context. - Add a Windows unit test validating
std::format(L"{}", std::string)produces the expected wide string for UTF-8 input. - Add a WSLC E2E test that exercises Unicode build output and asserts the expected Unicode substring is present.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| test/windows/wslc/e2e/WSLCE2EImageBuildTests.cpp | Adds an E2E test that validates Unicode output from wslc build is not corrupted. |
| test/windows/StringUnitTests.cpp | Adds a unit test covering UTF-8 std::string → wide std::format behavior. |
| src/shared/inc/stringshared.h | Fixes wide-context std::formatter implementations to format using wide format strings, preventing UTF-16 corruption. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Ben Hillis (benhillis)
approved these changes
Aug 21, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the Pull Request
The issue was using
std::format_towith a narrow string, which would actually convert the string back to utf8, and writing utf8 bytes on a wide string, causing corruptionPR Checklist
Detailed Description of the Pull Request / Additional comments
Validation Steps Performed