Skip to content

cut-huge-range.sh: make cut fails on usize::MAX #4988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2023
Merged

cut-huge-range.sh: make cut fails on usize::MAX #4988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99120d3
cut: fail when the input == usize::MAX
sylvestre Sep 24, 2023
265c258
ranges: add unit tests to verify the parsing
sylvestre Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/uucore/src/lib/features/ranges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ impl FromStr for Range {
fn parse(s: &str) -> Result<usize, &'static str> {
match s.parse::<usize>() {
Ok(0) => Err("fields and positions are numbered from 1"),
// GNU fails when we are at the limit. Match their behavior
Ok(n) if n == usize::MAX => Err("byte/character offset is too large"),
Ok(n) => Ok(n),
Err(_) => Err("failed to parse range"),
}
Expand Down Expand Up @@ -159,6 +161,7 @@ pub fn contain(ranges: &[Range], n: usize) -> bool {
#[cfg(test)]
mod test {
use super::{complement, Range};
use std::str::FromStr;

fn m(a: Vec<Range>, b: &[Range]) {
assert_eq!(Range::merge(a), b);
Expand Down Expand Up @@ -229,4 +232,33 @@ mod test {
// With start and end
assert_eq!(complement(&[r(1, 4), r(6, usize::MAX - 1)]), vec![r(5, 5)]);
}

#[test]
fn test_from_str() {
assert_eq!(Range::from_str("5"), Ok(Range { low: 5, high: 5 }));
assert_eq!(Range::from_str("3-5"), Ok(Range { low: 3, high: 5 }));
assert_eq!(
Range::from_str("5-3"),
Err("high end of range less than low end")
);
assert_eq!(Range::from_str("-"), Err("invalid range with no endpoint"));
assert_eq!(
Range::from_str("3-"),
Ok(Range {
low: 3,
high: usize::MAX - 1
})
);
assert_eq!(Range::from_str("-5"), Ok(Range { low: 1, high: 5 }));
assert_eq!(
Range::from_str("0"),
Err("fields and positions are numbered from 1")
);

let max_value = format!("{}", usize::MAX);
assert_eq!(
Range::from_str(&max_value),
Err("byte/character offset is too large")
);
}
}
8 changes: 8 additions & 0 deletions tests/by-util/test_cut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ fn test_whitespace_with_char() {
.code_is(1);
}

#[test]
fn test_too_large() {
new_ucmd!()
.args(&["-b1-18446744073709551615", "/dev/null"])
.fails()
.code_is(1);
}

#[test]
fn test_specify_delimiter() {
for param in ["-d", "--delimiter", "--del"] {
Expand Down