head: fix overflow errors #7721
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
|
GNU testsuite comparison: |
e9002cc to
09ef12f
Compare
|
GNU testsuite comparison: |
|
I don't think this quite fixes the linked issue. I tried compiling |
|
Should be fixed now. |
|
GNU testsuite comparison: |
|
I don't have an easy way to test GNU behavior on 32-bit platforms, so if commit d887038 is a regression, let me know. |
|
GNU testsuite comparison: |
jfinkels
approved these changes
Apr 12, 2025
| @@ -288,13 +282,7 @@ fn read_n_lines(input: &mut impl io::BufRead, n: u64, separator: u8) -> io::Resu | |||
| } | |||
|
|
|||
| fn catch_too_large_numbers_in_backwards_bytes_or_lines(n: u64) -> Option<usize> { | |||
There was a problem hiding this comment.
Let's just remove this helper function entirely and use the usize::try_from(n).ok() directly where needed.
d887038 to
37eee0e
Compare
|
GNU testsuite comparison: |
There was a problem hiding this comment.
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
Comments suppressed due to low confidence (3)
src/uu/head/src/parse.rs:20
- [nitpick] The variable 'plus_possible' may not clearly convey its intent; consider renaming it or adding an inline comment to clarify its purpose.
let mut plus_possible = false;
src/uu/head/src/parse.rs:101
- [nitpick] Using 'saturating_mul' changes the overflow behavior by masking potential errors; please confirm that this behavior is intended and that losing the overflow error signal is acceptable.
let num = num.saturating_mul(n);
src/uu/head/src/head.rs:194
- [nitpick] The consolidation of ParseError cases into a single error message may reduce clarity in error reporting; please verify that a unified message meets the expected behavior.
Some(Err(parse::ParseError)) => Err(HeadError::ParseError(format!("bad argument format: {}", s.quote()))),
|
Looks good to me, thanks. |
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.
closes #7166
Also changes number parsing to allow for a leading
+, in line with GNUhead