From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 13 Oct 2021 16:58:37 +0000 (-0700) Subject: bpo-45239: Fix parsedate_tz when time has more than 2 dots in it (GH-28452) (GH-28928) X-Git-Tag: v3.9.8~68 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5638618845752f713c00d69dbe705fed16761948;p=thirdparty%2FPython%2Fcpython.git bpo-45239: Fix parsedate_tz when time has more than 2 dots in it (GH-28452) (GH-28928) Co-authored-by: Łukasz Langa (cherry picked from commit b9e687618d3489944f29adbd2be50b46940c9e70) Co-authored-by: Ben Hoyt --- diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py index 178329fbc6aa..c5a7b23193ef 100644 --- a/Lib/email/_parseaddr.py +++ b/Lib/email/_parseaddr.py @@ -128,6 +128,8 @@ def _parsedate_tz(data): tss = 0 elif len(tm) == 3: [thh, tmm, tss] = tm + else: + return None else: return None try: diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 217a5b871090..bc062b5cb0c5 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -3008,6 +3008,7 @@ class TestMiscellaneous(TestEmailBase): self.assertIsNone(utils.parsedate_tz('0')) self.assertIsNone(utils.parsedate('A Complete Waste of Time')) self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time')) + self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800')) # Not a part of the spec but, but this has historically worked: self.assertIsNone(utils.parsedate(None)) self.assertIsNone(utils.parsedate_tz(None)) diff --git a/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst b/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst new file mode 100644 index 000000000000..9e5ec561c362 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-13-17-52-48.bpo-45239.7li1_0.rst @@ -0,0 +1,3 @@ +Fixed :func:`email.utils.parsedate_tz` crashing with +:exc:`UnboundLocalError` on certain invalid input instead of returning +``None``. Patch by Ben Hoyt.