From 607b70a896807372556f9760bcd1c004797ff36c Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@gmail.com>
Date: Wed, 16 Dec 2020 00:12:47 +0100
Subject: [PATCH] base32/base64: tolerate non-utf8 encoded inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For inputs that are valid base64 but that encode non-utf8 strings (like
garbage), base64 panicks when trying to unwrap the result from
String::from_utf8().
Instead of interpreting the byte stream as utf8, simply dump the raw
bytes to stdout.

Since the test assert that all io is valid utf8, this does not come with
a unit test. See run() in tests/common/utils.rs.

Eg.
"gD63hSj3ScS+wuOeGrubXlq35N1c5Lby/S+T7MNTjxo=" -> ">(Iľ^Z\/S"
---
 src/uu/base32/src/base_common.rs | 9 +++++++--
 src/uu/base64/src/base_common.rs | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs
index f6db40692..3f1436fb2 100644
--- a/src/uu/base32/src/base_common.rs
+++ b/src/uu/base32/src/base_common.rs
@@ -8,7 +8,7 @@
 // that was distributed with this source code.
 
 use std::fs::File;
-use std::io::{stdin, BufReader, Read};
+use std::io::{stdin, stdout, BufReader, Read, Write};
 use std::path::Path;
 
 use uucore::encoding::{wrap_print, Data, Format};
@@ -85,7 +85,12 @@ fn handle_input<R: Read>(
         wrap_print(&data, encoded);
     } else {
         match data.decode() {
-            Ok(s) => print!("{}", String::from_utf8(s).unwrap()),
+            Ok(s) => {
+                if stdout().write_all(&s).is_err() {
+                    // on windows console, writing invalid utf8 returns an error
+                    crash!(1, "Cannot write non-utf8 data");
+                }
+            }
             Err(_) => crash!(1, "invalid input"),
         }
     }
diff --git a/src/uu/base64/src/base_common.rs b/src/uu/base64/src/base_common.rs
index f6db40692..3f1436fb2 100644
--- a/src/uu/base64/src/base_common.rs
+++ b/src/uu/base64/src/base_common.rs
@@ -8,7 +8,7 @@
 // that was distributed with this source code.
 
 use std::fs::File;
-use std::io::{stdin, BufReader, Read};
+use std::io::{stdin, stdout, BufReader, Read, Write};
 use std::path::Path;
 
 use uucore::encoding::{wrap_print, Data, Format};
@@ -85,7 +85,12 @@ fn handle_input<R: Read>(
         wrap_print(&data, encoded);
     } else {
         match data.decode() {
-            Ok(s) => print!("{}", String::from_utf8(s).unwrap()),
+            Ok(s) => {
+                if stdout().write_all(&s).is_err() {
+                    // on windows console, writing invalid utf8 returns an error
+                    crash!(1, "Cannot write non-utf8 data");
+                }
+            }
             Err(_) => crash!(1, "invalid input"),
         }
     }