T6111: Fix modification of String.escaped to leave UTF-8 bytes unescaped #23
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
12 tasks
dmbaturin
requested changes
Mar 11, 2024
src/util.ml
Outdated
| let a = char_code c in | ||
| B.unsafe_set s' !n '\\'; | ||
| incr n; | ||
| B.unsafe_set s' !n (char_chr (48 + a / 100)); |
There was a problem hiding this comment.
I think we should move 48 to a constant with some descriptive name to make the code easier to read for someone who doesn't remember the details of the encoding offhand.
There was a problem hiding this comment.
I've tried to leave the function as close to the stdlib version as possible to aid readability by comparison, mutatis mutandis, but I can make the change.
The existing fix still passed the string as a whole to Bytes.escaped (as does the standard library function): the exemption of chars with high bit set needs to occur in Bytes.escaped as well.
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.
The existing fix still passed the string as a whole to Bytes.escaped (as does the standard library function): the exemption of chars with high bit set needs to occur in Bytes.escaped as well, otherwise a string containing, say, a unicode char and a backslash would still escape the unicode character, confounding the translation in T5996 (vyos/vyos-1x#3035).
It's not pretty, but nor are the stdlib functions. The related fixes in T5996 and T6111 should address the matter until we have a cleaner solution for unicode support.