Fix UTF-8 decoding of lazy bytestrings #333
Merged
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
|
I don't understand the doctest errors on GHC 8+, and on GHC 7+ the errors are that old versions of bytestring did not have |
Bodigrim
reviewed
May 6, 2021
Lysxia
force-pushed
the
utf-8-lazy
branch
2 times, most recently
from
b42b59c
to
de7c071
Compare
|
There's one uncovered branch because the tests only use an
|
|
That's probably fine, I guess. Looks good to me except GHC < 7.6 builds. |
Bodigrim
reviewed
May 8, 2021
Bodigrim
previously approved these changes
May 12, 2021
|
(Found a silly space.) |
Bodigrim
previously approved these changes
May 12, 2021
|
@Lysxia could you please resolve a conflict? |
At the beginning of a new chunk we may be trying to complete a UTF-8 sequence started in the previous chunk (contained in the `undecode0` buffer). If it turns out to be invalid, we must apply the `onErr` handler to every character in that buffer. When we reach the end of the chunk, we must also be more careful about when to keep the previous buffer: a UTF-8 sequence (up to 4 bytes) can span more than two chunks, when those chunks are very short (of length 0, 1, or 2).
Bodigrim
approved these changes
May 22, 2021
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.
Fixes #330.
I found another issue that's not yet fixed: both strict and lazy
decodeUtf8Withare actually memory unsafe if you use a badonErrargument. We allocate a destination buffer with 2x the number of bytes from the original bytestrings, but by using anonErrfunction which replaces any invalid byte with aCharwhich is a surrogate pair in UTF-16, it possible to blow up the size taken by aTextto 4x. In practice,onErris almost alwayslenientDecodethough, so perhaps a better solution than allocating more memory is to either hidedecodeUtf8Withor clamp the range ofonErr.