numfmt: don't panic on a multi-byte suffix under a multi-byte-separat… - #14065
Open
nagendramohan wants to merge 1 commit into
Open
numfmt: don't panic on a multi-byte suffix under a multi-byte-separat…#14065nagendramohan wants to merge 1 commit into
nagendramohan wants to merge 1 commit into
Conversation
…or locale
Under a locale whose decimal separator is multi-byte (e.g. ar_SA.UTF-8,
where it is the Arabic '٫', U+066B, 2 bytes), an input like '1٫€K'
aborted with a char-boundary panic in find_valid_number_with_suffix.
The numeric part was iterated with s.chars().skip(numeric_part.len()) —
using the *byte* length as a *character* count — which skipped past the
multi-byte separator incorrectly, and the result was then sliced with
&s[..=numeric_part.len()], landing inside a multi-byte suffix character.
Iterate the remainder from the numeric part's byte offset (a valid char
boundary, since it is a prefix of the input) and slice using each suffix
character's actual UTF-8 length. Malformed input is now rejected as GNU
does ('invalid suffix in input'), and valid multi-byte-separator input
such as '1٫5K' still parses.
Adds a regression test (verified failing before the fix). Closes uutils#13937.
Signed-off-by: Nagendra Mohan <nagendramohan1990@gmail.com>
Contributor
|
Duplicated PR. Please close this. |
|
GNU testsuite comparison: |
Merging this PR will improve performance by 5.04%
|
| Mode | Benchmark | BASE |
HEAD |
Efficiency | |
|---|---|---|---|---|---|
| ⚡ | Simulation | numfmt_stream_to_si_precision |
348.8 ms | 332.1 ms | +5.04% |
Tip
Curious why this is faster? Comment @codspeedbot explain why this is faster on this PR, or directly use the CodSpeed MCP with your agent.
Comparing nagendramohan:fix/numfmt-multibyte-suffix-panic-13937 (fdb2e42) with main (df30282)
Footnotes
-
50 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩
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
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.
…or locale
Under a locale whose decimal separator is multi-byte (e.g. ar_SA.UTF-8, where it is the Arabic '٫', U+066B, 2 bytes), an input like '1٫€K' aborted with a char-boundary panic in find_valid_number_with_suffix.
The numeric part was iterated with s.chars().skip(numeric_part.len()) — using the byte length as a character count — which skipped past the multi-byte separator incorrectly, and the result was then sliced with &s[..=numeric_part.len()], landing inside a multi-byte suffix character.
Iterate the remainder from the numeric part's byte offset (a valid char boundary, since it is a prefix of the input) and slice using each suffix character's actual UTF-8 length. Malformed input is now rejected as GNU does ('invalid suffix in input'), and valid multi-byte-separator input such as '1٫5K' still parses.
Adds a regression test (verified failing before the fix). Closes #13937.
Closes #13937.
Under a locale whose decimal separator is multi-byte (e.g. ar_SA.UTF-8, where it's the Arabic ٫, U+066B, 2 bytes), an input like 1٫€K aborted with a char-boundary panic:
Root cause: the numeric part was iterated with s.chars().skip(numeric_part.len()) — using its byte length as a character count — so a multi-byte separator was mis-skipped, and the result was then sliced with &s[..=numeric_part.len()], landing inside a multi-byte suffix char.
Fix: iterate the remainder from the numeric part's byte offset (a valid char boundary) and slice using each suffix char's actual len_utf8(). Malformed input is now rejected like GNU (invalid suffix in input), and valid multi-byte-separator input like 1٫5K still parses.
Adds a regression test (verified failing before the fix). cargo fmt, cargo clippy, and the full numfmt test suite pass.