COMMON: Fix Unicode support in JSON#6601
Merged
lephilousophe merged 1 commit intoscummvm:masterfrom May 18, 2025
Merged
Conversation
chkuendig
changed the title
Member
|
Thanks, merging. |
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
2 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.
JSON allows for keys and string values to be unicode encoded. Currently all non-ASCI characters are stripped by
JSON::untaintContentsand replaced with dots. This breaks access to files in cloud which have a unicode in the path (in my case it wasUltima IV™).This PR removes
JSON::untaintContentsand replaces it withJSON::zeroTerminateContentsand fixes a check to ignorechar < 0(which are all values >255 that overflow in a signed char to negative).This was discussed also in detail on Discord earlier today: https://discord.com/channels/581224060529148060/711242520415174666/1369945380292395049. With @lephilousophe recommending changing this check instead of moving to unsigned chars.