[Python-checkins] bpo-32178: Fix IndexError trying to parse 'To' header starting with ':'. (GH-15044)
Miss Islington (bot)
webhook-mailer at python.org
Sun Aug 11 17:04:35 EDT 2019
https://github.com/python/cpython/commit/9500bbe9372f6080decc49d2fd9365f0b927a0e2
commit: 9500bbe9372f6080decc49d2fd9365f0b927a0e2
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-08-11T14:04:31-07:00
summary:
bpo-32178: Fix IndexError trying to parse 'To' header starting with ':'. (GH-15044)
This should fix the IndexError trying to retrieve `DisplayName.display_name` and `DisplayName.value` when the `value` is basically an empty string.
https://bugs.python.org/issue32178
(cherry picked from commit 09a1872a8007048dcdf825a476816c5e3498b8f8)
Co-authored-by: Abhilash Raj <maxking at users.noreply.github.com>
files:
A Misc/NEWS.d/next/Library/2019-07-30-22-41-05.bpo-32178.X-IFLe.rst
M Lib/email/_header_value_parser.py
M Lib/test/test_email/test__header_value_parser.py
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index a93079278893..3d369e4822cd 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -549,6 +549,8 @@ class DisplayName(Phrase):
@property
def display_name(self):
res = TokenList(self)
+ if len(res) == 0:
+ return res.value
if res[0].token_type == 'cfws':
res.pop(0)
else:
@@ -570,7 +572,7 @@ def value(self):
for x in self:
if x.token_type == 'quoted-string':
quote = True
- if quote:
+ if len(self) != 0 and quote:
pre = post = ''
if self[0].token_type=='cfws' or self[0][0].token_type=='cfws':
pre = ' '
diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py
index 010be9fa4ae6..198cf17bbf3e 100644
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -1680,6 +1680,14 @@ def test_get_display_name_ending_with_obsolete(self):
self.assertEqual(display_name[3].comments, ['with trailing comment'])
self.assertEqual(display_name.display_name, 'simple phrase.')
+ def test_get_display_name_for_invalid_address_field(self):
+ # bpo-32178: Test that address fields starting with `:` don't cause
+ # IndexError when parsing the display name.
+ display_name = self._test_get_x(
+ parser.get_display_name,
+ ':Foo ', '', '', [errors.InvalidHeaderDefect], ':Foo ')
+ self.assertEqual(display_name.value, '')
+
# get_name_addr
def test_get_name_addr_angle_addr_only(self):
diff --git a/Misc/NEWS.d/next/Library/2019-07-30-22-41-05.bpo-32178.X-IFLe.rst b/Misc/NEWS.d/next/Library/2019-07-30-22-41-05.bpo-32178.X-IFLe.rst
new file mode 100644
index 000000000000..5e7a2e964d93
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-30-22-41-05.bpo-32178.X-IFLe.rst
@@ -0,0 +1 @@
+Fix IndexError in :mod:`email` package when trying to parse invalid address fields starting with ``:``.
More information about the Python-checkins
mailing list