FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-29412: Fix indexError when parsing a header value ending unexpectedly by maxking · Pull Request #14387 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-29412: Fix indexError when parsing a header value ending unexpectedly #14387

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

Merged
warsaw merged 4 commits into from
Jun 26, 2019
Conversation 10 Commits 4 Checks 0 Files changed
Merged

bpo-29412: Fix indexError when parsing a header value ending unexpectedly #14387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3540fc9
patched string index out of range error in get_word function of _head…
TyrannosourceExe May 16, 2018
2078cc8
Raise HeaderParseError instead of continuing when parsing a word.
maxking Jun 26, 2019
661962a
Undo code changed by mistake.
maxking Jun 26, 2019
a3cc163
Remove implicit concatenation
maxking Jun 26, 2019
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions Lib/email/_header_value_parser.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1360,6 +1360,9 @@ def get_word(value):
leader, value = get_cfws(value)
else:
leader = None
if not value:

warsaw Jun 26, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Do you want to catch all false-y values or just None?

maxking Jun 26, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I want to catch None and empty string '' values, both of which could cause IndexError when running value[0]. It could also be caused by empty list, empty tuple etc etc, but I don't think value can be of those datatypes.
raise errors.HeaderParseError(
"Expected 'atom' or 'quoted-string' but found nothing.")
if value[0]=='"':
token, value = get_quoted_string(value)
elif value[0] in SPECIALS:
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,12 @@ 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):
# bpo-29412: Test that we don't raise IndexError when parsing CFWS only
# token.
with self.assertRaises(errors.HeaderParseError):
parser.get_word('(Recipients list suppressed')

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 @@ -2343,6 +2349,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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix IndexError in parsing a header value ending unexpectedly. Patch by Abhilash
Raj.
Back | FazBrowse Home | New Git URL