Fix unicode decode bug on surrogate error mode #5546
Merged
Conversation
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
Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
800b6ba to
8b31735
Compare
Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
youknowone
reviewed
Feb 23, 2025
| let mut c: u32 = 0; | ||
| // Try decoding a single surrogate character. If there are more, | ||
| // let the codec call us again. | ||
| let p = &s.as_bytes()[range.start..]; | ||
| if p.len().saturating_sub(range.start) >= byte_length { | ||
| if p.len().overflowing_sub(range.start).0 >= byte_length { |
There was a problem hiding this comment.
Suggested change
| if p.len().overflowing_sub(range.start).0 >= byte_length { | |
| if p.len() >= range.start + byte_length { |
does this work?
276fc54 to
7801e2b
Compare
youknowone
approved these changes
Feb 23, 2025
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 #5542; error introduced by #5502. Adds some debug assertions that are also in cpython.
This will help allow test_argparse to work for windows.