Skip to content

Commit 3ae4ea1

Browse files
authored
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.
1 parent 68157da commit 3ae4ea1

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Lib/email/_header_value_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2047,7 +2047,7 @@ def get_msg_id(value):
20472047
no-fold-literal = "[" *dtext "]"
20482048
"""
20492049
msg_id = MsgID()
2050-
if value[0] in CFWS_LEADER:
2050+
if value and value[0] in CFWS_LEADER:
20512051
token, value = get_cfws(value)
20522052
msg_id.append(token)
20532053
if not value or value[0] != '<':

Lib/test/test_email/test__header_value_parser.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,6 +2583,11 @@ def test_invalid_content_transfer_encoding(self):
25832583

25842584
# get_msg_id
25852585

2586+
def test_get_msg_id_empty(self):
2587+
# bpo-38708: Test that HeaderParseError is raised and not IndexError.
2588+
with self.assertRaises(errors.HeaderParseError):
2589+
parser.get_msg_id('')
2590+
25862591
def test_get_msg_id_valid(self):
25872592
msg_id = self._test_get_x(
25882593
parser.get_msg_id,
@@ -2694,6 +2699,7 @@ def test_get_msg_id_no_angle_end(self):
26942699
self.assertEqual(msg_id.token_type, 'msg-id')
26952700

26962701

2702+
26972703
@parameterize
26982704
class Test_parse_mime_parameters(TestParserMixin, TestEmailBase):
26992705

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a potential IndexError in email parser when parsing an empty msg-id.

0 commit comments

Comments
 (0)