Skip to content

Commit 7a32bbd

Browse files
committed
gh-161966: Fix UnboundLocalError in email._header_value_parser for a domain literal starting with whitespace
1 parent 660bc16 commit 7a32bbd

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

‎Lib/email/_header_value_parser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,9 +1042,9 @@ def _get_ptext_to_endchars(value, endchars):
10421042
a flag that is True iff there were any quoted printables decoded.
10431043
10441044
"""
1045-
if not value:
1046-
return '', '', False
10471045
fragment, *remainder = _wsp_splitter(value, 1)
1046+
if not fragment:
1047+
return '', value, False
10481048
vchars = []
10491049
escape = False
10501050
had_qp = False

‎Lib/test/test_email/test__header_value_parser.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,10 @@ def test_get_dtext_empty(self):
13771377
self._test_get_x(parser.get_dtext,
13781378
'', '', '', [], '')
13791379

1380+
def test_get_dtext_leading_wsp(self):
1381+
self._test_get_x(parser.get_dtext,
1382+
' foo]', '', '', [], ' foo]')
1383+
13801384
# get_domain_literal
13811385

13821386
def test_get_domain_literal_only(self):
@@ -2897,6 +2901,17 @@ def test_parse_message_id_with_invalid_domain(self):
28972901
self.assertEqual(str(message_id.all_defects[-1]),
28982902
"end of input inside domain-literal")
28992903

2904+
def test_parse_message_id_with_wsp_in_literal(self):
2905+
message_id = self._test_parse_x(
2906+
parser.parse_message_id,
2907+
"<T@[ x]>",
2908+
"<T@[ x]>",
2909+
"<T@[ x]>",
2910+
[errors.ObsoleteHeaderDefect],
2911+
[],
2912+
)
2913+
self.assertEqual(message_id.token_type, 'message-id')
2914+
29002915
def test_parse_message_id_with_remaining(self):
29012916
message_id = self._test_parse_x(
29022917
parser.parse_message_id,
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix :exc:`UnboundLocalError` in :mod:`email` header parsing when a
2+
domain literal in a ``Message-ID``, ``References`` or ``In-Reply-To``
3+
header starts with whitespace, such as ``<a@[ x]>``.

0 commit comments

Comments
 (0)