diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2021-04-14 13:45:24 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-04-15 07:58:48 +0200 |
| commit | 539d005aa5fb496f0a648a2385465eca06c604e9 (patch) | |
| tree | d2fdd48674a32cca0117bdc075752d94836daa33 /django | |
| parent | 208e72276a3e12a4e7998b9a1219bc96a16cf7b8 (diff) | |
[3.2.x] Fixed #32643 -- Fixed decoding of messages in the pre-Django 3.2 format.
Thanks Jan Pieter Waagmeester for the report.
Regression in 2d6179c819010f6a9d00835d5893c4593c0b85a0.
Backport of 4511d1459810037b91faa5b506e4f75c77aa72be from main.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/messages/storage/cookie.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/messages/storage/cookie.py b/django/contrib/messages/storage/cookie.py index 30689dde3b..17bed82057 100644 --- a/django/contrib/messages/storage/cookie.py +++ b/django/contrib/messages/storage/cookie.py @@ -1,3 +1,4 @@ +import binascii import json from django.conf import settings @@ -182,7 +183,7 @@ class CookieStorage(BaseStorage): # with: # decoded = None. decoded = self._legacy_decode(data) - except json.JSONDecodeError: + except (binascii.Error, json.JSONDecodeError): decoded = self.signer.unsign(data) if decoded: |