diff options
author | Josh Boyer <jwboyer@redhat.com> | 2023-10-24 11:20:07 +0000 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2023-10-24 11:20:07 +0000 |
commit | 5f560c1e0d357114cdeaab91e5ff0a9fb8be6221 (patch) | |
tree | 0f573d97b3bf73a0830cb7af85b2837521e5ba78 | |
parent | ad84593de285962871a5909e5bf5ef23170d4908 (diff) | |
parent | 7bfa5f4d10c4921a87a1b4588e63aec3b8c2c60c (diff) | |
download | linux-firmware-5f560c1e0d357114cdeaab91e5ff0a9fb8be6221.tar.gz |
Merge branch 'mlimonci/unicode' into 'main'
Catch unicode decode errors
See merge request kernel-firmware/linux-firmware!37
-rwxr-xr-x | contrib/process_linux_firmware.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/process_linux_firmware.py b/contrib/process_linux_firmware.py index 2b7c7f8d..ab005ee7 100755 --- a/contrib/process_linux_firmware.py +++ b/contrib/process_linux_firmware.py @@ -44,11 +44,15 @@ def classify_content(content): for part in msg.walk(): if part.get_content_type() == "text/plain": - body = part.get_payload(decode=True).decode("utf-8") - for key in content_types.keys(): - if key in body: - return content_types[key] - break + try: + body = part.get_payload(decode=True).decode("utf-8") + for key in content_types.keys(): + if key in body: + return content_types[key] + break + except UnicodeDecodeError as e: + logging.warning("Failed to decode email: %s, treating as SPAM" % e) + break return ContentType.SPAM |