Skip to content

bpo-29412: patched string index out of range error in get_word function of _head… #6907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

bpo-29412: patched string index out of range error in get_word function of _head… #6907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,15 +1336,21 @@ def get_word(value):
leader, value = get_cfws(value)
else:
leader = None
if value[0]=='"':
token, value = get_quoted_string(value)
elif value[0] in SPECIALS:
raise errors.HeaderParseError("Expected 'atom' or 'quoted-string' "
"but found '{}'".format(value))
if value:
if value[0]=='"':
token, value = get_quoted_string(value)
elif value[0] in SPECIALS:
raise errors.HeaderParseError("Expected 'atom' or 'quoted-string' "
"but found '{}'".format(value))
else:
token, value = get_atom(value)
if leader is not None:
token[:0] = [leader]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be no need to copy these two lines from below.

else:
token, value = get_atom(value)
if leader is not None:
token[:0] = [leader]

return token, value

def get_phrase(value):
Expand Down
25 changes: 25 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,20 @@ def test_get_word_atom_yields_atom(self):
self.assertEqual(word.token_type, 'atom')
self.assertEqual(word[0].token_type, 'cfws')

def test_get_word_all_CFWS(self):
word = self._test_get_x(parser.get_word,
'(Recipients list suppressed',
str(parser.CFWSList([parser.Comment([
parser.WhiteSpaceTerminal('Recipients', 'ptext'),
parser.WhiteSpaceTerminal(' ', 'fws'),
parser.WhiteSpaceTerminal('list', 'ptext'),
parser.WhiteSpaceTerminal(' ', 'fws'),
parser.WhiteSpaceTerminal('suppressed', 'ptext')
])])),
' ', [], ''
)
self.assertEqual(word.token_type, 'cfws')

def test_get_word_qs_yields_qs(self):
word = self._test_get_x(parser.get_word,
'"bar " (bang) ah', '"bar " (bang) ', 'bar ', [], 'ah')
Expand Down Expand Up @@ -2289,6 +2303,17 @@ def test_get_address_quoted_strings_in_atom_list(self):

# get_address_list

def test_get_address_list_CFWS(self):
address_list = self._test_get_x(parser.get_address_list,
'(Recipient list suppressed)',
'(Recipient list suppressed)',
' ',
[errors.ObsoleteHeaderDefect], # no content in address list
'')
self.assertEqual(address_list.token_type, 'address-list')
self.assertEqual(len(address_list.mailboxes), 0)
self.assertEqual(address_list.mailboxes, address_list.all_mailboxes)

def test_get_address_list_mailboxes_simple(self):
address_list = self._test_get_x(parser.get_address_list,
'dinsdale@example.com',
Expand Down