From 5a5c7c5a346ca0971f7f42ce216cafbb8ae8f334 Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Sun, 6 Jun 2021 11:33:22 +0200
Subject: [PATCH] sort: properly check for empty reads

---
 src/uu/sort/src/chunks.rs  | 22 +++++++++++-----------
 tests/by-util/test_sort.rs |  9 +++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/uu/sort/src/chunks.rs b/src/uu/sort/src/chunks.rs
index 3705f2cf7..dde6febd3 100644
--- a/src/uu/sort/src/chunks.rs
+++ b/src/uu/sort/src/chunks.rs
@@ -102,17 +102,17 @@ pub fn read(
         carry_over.clear();
         carry_over.extend_from_slice(&buffer[read..]);
 
-        let payload = Chunk::new(buffer, |buf| {
-            let mut lines = unsafe {
-                // SAFETY: It is safe to transmute to a vector of lines with shorter lifetime,
-                // because it was only temporarily transmuted to a Vec<Line<'static>> to make recycling possible.
-                std::mem::transmute::<Vec<Line<'static>>, Vec<Line<'_>>>(lines)
-            };
-            let read = crash_if_err!(1, std::str::from_utf8(&buf[..read]));
-            parse_lines(read, &mut lines, separator, &settings);
-            lines
-        });
-        if !payload.borrow_lines().is_empty() {
+        if read != 0 {
+            let payload = Chunk::new(buffer, |buf| {
+                let mut lines = unsafe {
+                    // SAFETY: It is safe to transmute to a vector of lines with shorter lifetime,
+                    // because it was only temporarily transmuted to a Vec<Line<'static>> to make recycling possible.
+                    std::mem::transmute::<Vec<Line<'static>>, Vec<Line<'_>>>(lines)
+                };
+                let read = crash_if_err!(1, std::str::from_utf8(&buf[..read]));
+                parse_lines(read, &mut lines, separator, &settings);
+                lines
+            });
             sender.send(payload).unwrap();
         }
         if !should_continue {
diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs
index 97127b995..d100e2141 100644
--- a/tests/by-util/test_sort.rs
+++ b/tests/by-util/test_sort.rs
@@ -800,3 +800,12 @@ fn sort_multiple() {
         .succeeds()
         .stdout_is("a\nb\nb\n");
 }
+
+#[test]
+fn sort_empty_chunk() {
+    new_ucmd!()
+        .args(&["-S", "40B"])
+        .pipe_in("a\na\n")
+        .succeeds()
+        .stdout_is("a\na\n");
+}