touch: fix char-boundary panic on a multibyte char in a -t timestamp#12619
Open
leeewee wants to merge 1 commit into
Open
touch: fix char-boundary panic on a multibyte char in a -t timestamp#12619leeewee wants to merge 1 commit into
leeewee wants to merge 1 commit into
Conversation
`touch -t '€123456789'` aborted with "byte index N is not a char boundary". `parse_timestamp` routes timestamps whose char count is 10 or 13 through `prepend_century`, which byte-sliced `s[..2]` to read the YY digits; a leading multibyte char (e.g. '€') made byte index 2 land mid-UTF-8 and panic before the `parse::<u32>()` error could fire. Take the first two chars instead of byte-slicing, so a multibyte/non-digit prefix yields the invalid-date error (exit 1) like GNU instead of crashing.
|
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
1 participant
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 #12618
touch -t '€123456789'(a leading multibyte char in a 10- or 13-char timestamp) aborted with "byte index N is not a char boundary":prepend_centurybyte-sliceds[..2]to read the YY digits, splitting the multibyte char.Take the first two chars instead of byte-slicing, so a multibyte/non-digit prefix yields the invalid-date error (exit 1) like GNU instead of crashing. Adds a regression test.