summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-08-11 21:04:31 (GMT)
committerGitHub <noreply@github.com>2019-08-11 21:04:31 (GMT)
commit9500bbe9372f6080decc49d2fd9365f0b927a0e2 (patch)
treeccc4bc441185a56739a190c80588ac43abda052e
parentc61f9b57cfce9e96bdea5674634e3a9c185b675f (diff)
downloadcpython-9500bbe9372f6080decc49d2fd9365f0b927a0e2.zip
cpython-9500bbe9372f6080decc49d2fd9365f0b927a0e2.tar.gz
cpython-9500bbe9372f6080decc49d2fd9365f0b927a0e2.tar.bz2
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@users.noreply.github.com>
-rw-r--r--Lib/email/_header_value_parser.py4
-rw-r--r--Lib/test/test_email/test__header_value_parser.py8
-rw-r--r--Misc/NEWS.d/next/Library/2019-07-30-22-41-05.bpo-32178.X-IFLe.rst1
3 files changed, 12 insertions, 1 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index a930792..3d369e4 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 @@ class DisplayName(Phrase):
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 010be9f..198cf17 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 @@ class TestParser(TestParserMixin, TestEmailBase):
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 0000000..5e7a2e9
--- /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 ``:``.