cat: bugfix when running with -T option

karlmcdowall · karlmcdowall · commit 6d754729deee · 2025-04-02T16:56:38.000-06:00
Fixes an crash seen when running with -T option if no newline
is found in a buffer.
Added unit test to validate.
diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs
@@ -644,7 +644,7 @@ fn write_tab_to_end<W: Write>(mut in_buf: &[u8], writer: &mut W) -> usize {
             }
             None => {
                 writer.write_all(in_buf).unwrap();
-                return in_buf.len();
+                return in_buf.len() + count;
             }
         };
     }
@@ -688,6 +688,22 @@ fn write_end_of_line<W: Write>(
 mod tests {
     use std::io::{BufWriter, stdout};
 
+    #[test]
+    fn test_write_tab_to_end_new_line() {
+        let mut writer = BufWriter::with_capacity(1024 * 64, stdout());
+        let in_buf = b"a\tb\tc\n";
+        let tab = b"";
+        assert_eq!(super::write_tab_to_end(in_buf, &mut writer), 5);
+    }
+
+    #[test]
+    fn test_write_tab_to_end_no_new_line() {
+        let mut writer = BufWriter::with_capacity(1024 * 64, stdout());
+        let in_buf = b"a\tb\tc";
+        let tab = b"";
+        assert_eq!(super::write_tab_to_end(in_buf, &mut writer), 5);
+    }
+
     #[test]
     fn test_write_nonprint_to_end_new_line() {
         let mut writer = BufWriter::with_capacity(1024 * 64, stdout());
