RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #1609 from kevinburkemeter/sort-panic

Browse source 
sort: fix panic on write to closed pipe
This commit is contained in:
Sylvestre Ledru 2020-10-22 07:51:59 +02:00 • committed by GitHub
commit ce66f3fbdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/uu/sort/src/sort.rs
View file

@ -550,10 +550,7 @@ where
for line in iter {
let str = format!("{}\n", line);
if let Err(e) = file.write_all(str.as_bytes()) {
show_error!("sort: {0}", e.to_string());
panic!("Write failed");
}
crash_if_err!(1, file.write_all(str.as_bytes()))
}
}

13
tests/by-util/test_sort.rs
View file

@ -118,6 +118,19 @@ fn test_merge_reversed() {
.stdout_only_fixture("merge_ints_reversed.expected");
}
#[test]
fn test_pipe() {
// TODO: issue 1608 reports a panic when we attempt to read from stdin,
// which was closed by the other side of the pipe. This test does not
// protect against regressions in that case; we should add one at some
// point.
new_ucmd!()
.pipe_in("one\ntwo\nfour")
.succeeds()
.stdout_is("four\none\ntwo\n")
.stderr_is("");
}
#[test]
fn test_check() {
new_ucmd!()