27988: Make sure iter_attachments does not mutate the payload list.

This commit is contained in:
R David Murray 2016-09-07 13:39:36 -04:00
parent 48c88307d8
commit c2e2473bc2
3 changed files with 13 additions and 1 deletions

View File

@ -1022,7 +1022,7 @@ class MIMEPart(Message):
maintype, subtype = self.get_content_type().split('/')
if maintype != 'multipart' or subtype == 'alternative':
return
parts = self.get_payload()
parts = self.get_payload().copy()
if maintype == 'multipart' and subtype == 'related':
# For related, we treat everything but the root as an attachment.
# The root may be indicated by 'start'; if there's no start or we

View File

@ -732,6 +732,16 @@ class TestEmailMessageBase:
m.set_param('filename', 'abc.png', 'Content-Disposition')
self.assertTrue(m.is_attachment())
def test_iter_attachments_mutation(self):
# We had a bug where iter_attachments was mutating the list.
m = self._make_message()
m.set_content('arbitrary text as main part')
m.add_related('more text as a related part')
m.add_related('yet more text as a second "attachment"')
orig = m.get_payload().copy()
self.assertEqual(len(list(m.iter_attachments())), 2)
self.assertEqual(m.get_payload(), orig)
class TestEmailMessage(TestEmailMessageBase, TestEmailBase):
message = EmailMessage

View File

@ -62,6 +62,8 @@ Core and Builtins
Library
-------
- Issue 27988: Fix email iter_attachments incorrect mutation of payload list.
- Issue #27691: Fix ssl module's parsing of GEN_RID subject alternative name
fields in X.509 certs.