From 2368a6a3fd32be60ecc9ae2d45e0f608c5b77545 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 2 Oct 2020 08:19:28 -0400 Subject: Use bytes when dumping to stdout We don't need to needlessly convert to unicode when dumping to stdout, especially when it can lead to crashers when we encounter other charsets. Reported-by: Rob Herring Signed-off-by: Konstantin Ryabitsev --- b4/mbox.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/b4/mbox.py b/b4/mbox.py index fb82389..754d0f8 100644 --- a/b4/mbox.py +++ b/b4/mbox.py @@ -234,8 +234,8 @@ def mbox_to_am(mboxfile, cmdargs): am_mbx.close() if cmdargs.outdir == '-': logger.info('---') - with open(am_filename, 'r') as fh: - shutil.copyfileobj(fh, sys.stdout) + with open(am_filename, 'rb') as fh: + shutil.copyfileobj(fh, sys.stdout.buffer) os.unlink(am_filename) thanks_record_am(lser, cherrypick=cherrypick) @@ -511,8 +511,8 @@ def main(cmdargs): mbx.close() if cmdargs.outdir == '-': logger.info('---') - with open(threadmbox, 'r') as fh: - shutil.copyfileobj(fh, sys.stdout) + with open(threadmbox, 'rb') as fh: + shutil.copyfileobj(fh, sys.stdout.buffer) os.unlink(threadmbox) return -- cgit v1.2.3