Skip to content

Commit

Permalink
bpo-32178: Fix IndexError trying to parse 'To' header starting with '…
Browse files Browse the repository at this point in the history
…:'. (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 09a1872)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
  • Loading branch information
miss-islington and maxking committed Aug 11, 2019
1 parent c48d606 commit dec231a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Lib/email/_header_value_parser.py
Expand Up @@ -566,6 +566,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:
Expand All @@ -587,7 +589,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 = ' '
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
Expand Up @@ -1700,6 +1700,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):
Expand Down
@@ -0,0 +1 @@
Fix IndexError in :mod:`email` package when trying to parse invalid address fields starting with ``:``.

0 comments on commit dec231a

Please sign in to comment.