mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-31 19:46:42 +00:00
Code Issues 32 Releases Wiki Activity

[5.0.x] Refs #34900, Refs #35361 -- Fixed SafeMIMEText.set_payload() crash on Python 3.13.

Browse Source 
Payloads with surrogates are passed to the set_payload() since
f97f25ef5d

Backport of b231bcd19e57267ce1fc21d42d46f0b65fdcfcf8 from main.
This commit is contained in:
Mariusz Felisiak 2024-03-15 12:51:40 +01:00 committed by Sarah Boyce
parent f075a19e85
commit 2e6ae1e96a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/mail/message.py
View File

@ -168,7 +168,8 @@ class SafeMIMEText(MIMEMixin, MIMEText):
def set_payload(self, payload, charset=None): def set_payload(self, payload, charset=None):
if charset == "utf-8" and not isinstance(charset, Charset.Charset): if charset == "utf-8" and not isinstance(charset, Charset.Charset):
has_long_lines = any( has_long_lines = any(
len(line.encode()) > RFC5322_EMAIL_LINE_LENGTH_LIMIT len(line.encode(errors="surrogateescape"))
> RFC5322_EMAIL_LINE_LENGTH_LIMIT
for line in payload.splitlines() for line in payload.splitlines()
) )
# Quoted-Printable encoding has the side effect of shortening long # Quoted-Printable encoding has the side effect of shortening long