From 0a588fac1c82d9c259eb56f0ec15d23b6f9a0989 Mon Sep 17 00:00:00 2001 From: khazhyk Date: Mon, 24 Jul 2017 21:37:46 -0700 Subject: [PATCH] allow trailing null bytes in uploaded jpegs --- discord/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/utils.py b/discord/utils.py index d7b045035..9efb1bf85 100644 --- a/discord/utils.py +++ b/discord/utils.py @@ -242,7 +242,7 @@ def _get_as_snowflake(data, key): def _get_mime_type_for_image(data): if data.startswith(b'\x89\x50\x4E\x47\x0D\x0A\x1A\x0A'): return 'image/png' - elif data.startswith(b'\xFF\xD8') and data.endswith(b'\xFF\xD9'): + elif data.startswith(b'\xFF\xD8') and data.rstrip(b'\0').endswith(b'\xFF\xD9'): return 'image/jpeg' elif data.startswith(b'\x47\x49\x46\x38\x37\x61') or data.startswith(b'\x47\x49\x46\x38\x39\x61'): return 'image/gif'