ptx: use char counts for before-chunk sizing in get_output_chunks - #12685
Merged
Conversation
Contributor
|
Hm, the linked issue is already fixed. Is this PR still necessary? |
Contributor
Author
|
It is a follow up |
sylvestre
force-pushed
the
ptx-fix-panic-multibyte-before
branch
from
June 7, 2026 19:54
ced2a38 to
17ead12
Compare
cakebaker
reviewed
Jun 16, 2026
| .args(&["-w", "20"]) | ||
| .pipe_in("aé bé KEY cc dd ee ff gg\n") | ||
| .succeeds() | ||
| .stdout_contains("cc/ aé"); |
Contributor
There was a problem hiding this comment.
Hm, GNU ptx doesn't contain such an output:
$ printf "aé bé KEY cc dd ee ff gg\n" | ptx -w20
/� bé KEY cc/
aé bé/
aé bé KEY/
/� KEY cc dd ee/
/cc dd ee ff/
/cc dd ee ff gg
/dd ee ff gg
ee ff gg /dd
cakebaker
reviewed
Jun 16, 2026
| } | ||
|
|
||
| #[test] | ||
| fn test_unicode_in_before_chunk_does_not_panic() { |
Contributor
There was a problem hiding this comment.
I'm not sure about this test. Our output is quite different than the output of GNU ptx and so I don't know if this test will suddenly start to fail when we reach compatibility with GNU ptx.
The max_before_size assert compared against before.len() (byte length) while max_before_size is measured in chars, panicking on multibyte input like 'éé word'. The tail-chunk budget (max_tail_size) had the same byte/char mismatch, shrinking the tail too much and dropping a word that fits. Use char counts in both places, matching the after chunk. Fixes uutils#10893
sylvestre
force-pushed
the
ptx-fix-panic-multibyte-before
branch
from
July 4, 2026 16:36
17ead12 to
9601c75
Compare
|
GNU testsuite comparison: |
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.
The max_before_size assert compared against before.len() (byte length) while max_before_size is measured in chars, panicking on multibyte input like 'éé word'. The tail-chunk budget (max_tail_size) had the same byte/char mismatch, shrinking the tail too much and dropping a word that fits. Use char counts in both places, matching the after chunk.
Fixes #10893