Refs #40 - Null characters are now always replaced with "" in digest.py.

SpamExperts · Jan 14, 2016 · b2b1d02 · b2b1d02
1 parent 625012f
commit b2b1d02
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/pyzor/digest.py b/pyzor/digest.py
@@ -157,18 +157,14 @@ def digest_payloads(cls, msg):
                     errors = "strict"
 
                 try:
+                    if "\00" in payload:
+                        payload = payload.replace("\00", "")
                     payload = payload.decode(charset, errors)
-                except (LookupError, UnicodeError, AssertionError, TypeError):
+                except (LookupError, UnicodeError, AssertionError):
                     try:
                         payload = payload.decode("ascii", "ignore")
                     except UnicodeError:
                         continue
-                    except TypeError:
-                        try:
-                            payload = payload.replace("\00", "")
-                            payload = payload.decode(charset, errors)
-                        except ValueError:
-                            pass  # No nulls were found, which is okay.
                 if part.get_content_subtype() == "html":
                     yield cls.normalize_html_part(payload)
                 else: