Fix #12648: Ensure all uses of std::filesystem::path use native encoding. #12650
Conversation
This file contains 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
…e encoding. std::filesystem::path does not expect UTF-8 strings, so they must be converted to native format first (and back to utf-8 after.)
PeterN
added
the
backport requested
|
Not sure if this fixes all problems but it seems to go some way to help. |
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.
Motivation / Problem
std::filesystem::path does not expect UTF-8 strings, and it seems may produce invalid results when done so, so they must be converted to native format first (and back to utf-8 after.)
Description
Ensure strings passed to std::filesystem::path go through OTTD2FS conversion, and back to UTF-8 with FS2OTTD after.
Sadly std::filesystem::path will implicitly convert a std::string, so it's difficult to catch all case.
This is not the correct way to deal with this situation. C++20 would like us to use std::u8string everything, but that is not really feasible. So this is a quick & dirty fix without adding too much code.
Maybe fixes #12648 .
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.