diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-12-05 17:42:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 17:42:01 (GMT) |
| commit | e21aa61e96f8343200e765d119ebe778873a6bf1 (patch) | |
| tree | b5349053ac33a268b72c02e802bf5d9032e93fda | |
| parent | cfdaf92221da3c264d0da9c588994fefe4073196 (diff) | |
| download | cpython-e21aa61e96f8343200e765d119ebe778873a6bf1.zip cpython-e21aa61e96f8343200e765d119ebe778873a6bf1.tar.gz cpython-e21aa61e96f8343200e765d119ebe778873a6bf1.tar.bz2 | |
bpo-38698: Prevent UnboundLocalError to pop up in parse_message_id (GH-17277)
parse_message_id() was improperly using a token defined inside an exception
handler, which was raising `UnboundLocalError` on parsing an invalid value.
https://bugs.python.org/issue38698
(cherry picked from commit bb815499af855b1759c02535f8d7a9d0358e74e8)
Co-authored-by: Claudiu Popa <pcmanticore@gmail.com>
| -rw-r--r-- | Lib/email/_header_value_parser.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_email/test__header_value_parser.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-12-02-10-35-19.bpo-38698.WZnAPQ.rst | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index 1668b4a..abdef81 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -2113,7 +2113,8 @@ def parse_message_id(value): except errors.HeaderParseError: message_id.defects.append(errors.InvalidHeaderDefect( "Expected msg-id but found {!r}".format(value))) - message_id.append(token) + else: + message_id.append(token) return message_id # diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index e442c44..2f63a3b 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -2638,6 +2638,12 @@ class TestParser(TestParserMixin, TestEmailBase): ) self.assertEqual(msg_id.token_type, 'msg-id') + def test_get_msg_id_invalid_expected_msg_id_not_found(self): + text = "Message-Id: 935-XPB-567:0:86089:180874:0:45327:9:90305:17843586-40@example.com" + msg_id = parser.parse_message_id(text) + self.assertDefectsEqual(msg_id.all_defects, + [errors.InvalidHeaderDefect]) + def test_get_msg_id_no_angle_start(self): with self.assertRaises(errors.HeaderParseError): parser.get_msg_id("msgwithnoankle") diff --git a/Misc/NEWS.d/next/Library/2019-12-02-10-35-19.bpo-38698.WZnAPQ.rst b/Misc/NEWS.d/next/Library/2019-12-02-10-35-19.bpo-38698.WZnAPQ.rst new file mode 100644 index 0000000..e606acb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-02-10-35-19.bpo-38698.WZnAPQ.rst @@ -0,0 +1,5 @@ +Prevent UnboundLocalError to pop up in parse_message_id + +parse_message_id() was improperly using a token defined inside an exception +handler, which was raising `UnboundLocalError` on parsing an invalid value. +Patch by Claudiu Popa. |