bpo-45239: Fix parsedate_tz when time has more than 2 dots in it (GH-28452)

benhoyt · ambv · web-flow · commit b9e687618d34 · 2021-10-13T18:21:27.000+02:00
Co-authored-by: Łukasz Langa &lt;lukasz@langa.pl&gt;
diff --git 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
@@ -3009,6 +3009,7 @@ def test_parsedate_returns_None_for_invalid_strings(self):
         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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fixed :func:`email.utils.parsedate_tz` crashing with
	`2`	+:exc:`UnboundLocalError` on certain invalid input instead of returning
	`3`	+``None``. Patch by Ben Hoyt.