diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-12-09 02:12:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 02:12:50 (GMT) |
| commit | 2abd3a8f580e6c7b1ce88b2ae9f9a783f4aea5d3 (patch) | |
| tree | fa0a5235b5e76c5548cc961b70dab10adda146ea | |
| parent | f66f4a09d0b6817fe6a86a567fd506aa223f1563 (diff) | |
| download | cpython-2abd3a8f580e6c7b1ce88b2ae9f9a783f4aea5d3.zip cpython-2abd3a8f580e6c7b1ce88b2ae9f9a783f4aea5d3.tar.gz cpython-2abd3a8f580e6c7b1ce88b2ae9f9a783f4aea5d3.tar.bz2 | |
bpo-38708: email: Fix a potential IndexError when parsing Message-ID (GH-17504)
Fix a potential IndexError when passing an empty value to the message-id
parser. Instead, HeaderParseError should be raised.
(cherry picked from commit 3ae4ea1931361dd2743e464790e739d9285501bf)
Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
| -rw-r--r-- | Lib/email/_header_value_parser.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/test__header_value_parser.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-12-07-22-25-39.bpo-38708.rZTUfk.rst | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index cb01322..9c55ef7 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -2047,7 +2047,7 @@ def get_msg_id(value): no-fold-literal = "[" *dtext "]" """ msg_id = MsgID() - if value[0] in CFWS_LEADER: + if value and value[0] in CFWS_LEADER: token, value = get_cfws(value) msg_id.append(token) if not value or value[0] != '<': diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index 7c9f987..4b5b442 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -2583,6 +2583,11 @@ class TestParser(TestParserMixin, TestEmailBase): # get_msg_id + def test_get_msg_id_empty(self): + # bpo-38708: Test that HeaderParseError is raised and not IndexError. + with self.assertRaises(errors.HeaderParseError): + parser.get_msg_id('') + def test_get_msg_id_valid(self): msg_id = self._test_get_x( parser.get_msg_id, @@ -2694,6 +2699,7 @@ class TestParser(TestParserMixin, TestEmailBase): self.assertEqual(msg_id.token_type, 'msg-id') + @parameterize class Test_parse_mime_parameters(TestParserMixin, TestEmailBase): diff --git a/Misc/NEWS.d/next/Library/2019-12-07-22-25-39.bpo-38708.rZTUfk.rst b/Misc/NEWS.d/next/Library/2019-12-07-22-25-39.bpo-38708.rZTUfk.rst new file mode 100644 index 0000000..23a0a46 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-07-22-25-39.bpo-38708.rZTUfk.rst @@ -0,0 +1 @@ +Fix a potential IndexError in email parser when parsing an empty msg-id. |