From 75c2cff7ba29fa7bc92428ade415e26dd4694696 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Wed, 28 Jun 2017 17:48:45 +1000 Subject: [PATCH] parser: codec lookup fails when a NUL (\x00) is in the name On Python3 this presents as a ValueError On Python2 this presents as a TypeError In both cases, catch these exceptions. Signed-off-by: Daniel Axtens Reviewed-by: Stephen Finucane --- patchwork/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patchwork/parser.py b/patchwork/parser.py index f9934cc1..534e92c7 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -436,7 +436,7 @@ def _find_content(mail): if charset is not None: try: codecs.lookup(charset) - except LookupError: + except (LookupError, ValueError, TypeError): charset = None # If there is no charset or if it is unknown, then try some common -- 2.47.3