Skip to content

Commit 2eac1f5

Browse files
committed
gh-78206: Limit base64-encoded attachment lines to 76 characters
1 parent 3bfea9f commit 2eac1f5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎Lib/email/contentmanager.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,10 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
226226
params=None, headers=None):
227227
_prepare_set(msg, maintype, subtype, headers)
228228
if cte == 'base64':
229-
data = binascii.b2a_base64(data, wrapcol=msg.policy.max_line_length)
229+
maxlen = msg.policy.max_line_length
230+
if maxlen:
231+
maxlen = min(maxlen, 76)
232+
data = binascii.b2a_base64(data, wrapcol=maxlen)
230233
data = data.decode('ascii')
231234
elif cte == 'quoted-printable':
232235
# XXX: quoprimime.body_encode won't encode newline characters in data,

0 commit comments

Comments
 (0)