Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions src/uu/pr/src/pr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,17 @@ fn build_options(

let invalid_pages_map = |i: String| {
let unparsed_value = matches.get_one::<String>(options::PAGES).unwrap();
i.parse::<usize>().map_err(|_e| PrError::EncounteredErrors {
let parsed_value = i.parse::<usize>().map_err(|_e| PrError::EncounteredErrors {
msg: format!("invalid --pages argument {}", unparsed_value.quote()),
})
});

match parsed_value {
Ok(0) => Err(PrError::EncounteredErrors {
msg: "invalid --pages argument '0'".to_string(),
}),
Ok(res) => Ok(res),
Err(e) => Err(e),
}
};

let res = matches
Expand Down Expand Up @@ -750,6 +758,12 @@ fn build_options(
let page_length =
parse_usize(matches, options::PAGE_LENGTH).unwrap_or(Ok(default_lines_per_page))?;

if page_length == 0 {
return Err(PrError::EncounteredErrors {
msg: "invalid --length argument '0'".to_string(),
});
}

let page_length_le_ht = page_length < (HEADER_LINES_PER_PAGE + TRAILER_LINES_PER_PAGE);

let display_header_and_trailer = !page_length_le_ht
Expand Down
16 changes: 16 additions & 0 deletions tests/by-util/test_pr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -946,3 +946,19 @@ fn test_zero_page_width() {
.fails_with_code(1)
.stderr_is("pr: invalid --page-width argument '0'\n");
}

#[test]
fn test_zero_length() {
new_ucmd!()
.args(&["-l", "0"])
.fails_with_code(1)
.stderr_is("pr: invalid --length argument '0'\n");
}

#[test]
fn test_zero_pages() {
new_ucmd!()
.args(&["--pages", "0"])
.fails_with_code(1)
.stderr_is("pr: invalid --pages argument '0'\n");
}
Loading