Skip to content

bpo-33529: Fix Infinite loop on folding email if headers has non_ascii #7763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

bpo-33529: Fix Infinite loop on folding email if headers has non_ascii #7763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2727,13 +2727,14 @@ def _fold_as_ew(to_encode, lines, maxlen, last_ew, ew_combine_allowed, charset):
first_part = to_encode[:text_space]
ew = _ew.encode(first_part, charset=encode_as)
excess = len(ew) - remaining_space
encoded_first_part = ew.split('?')[3]
if excess > 0:
# encode always chooses the shortest encoding, so this
# is guaranteed to fit at this point.
first_part = first_part[:-excess]
encoded_first_part = encoded_first_part[:-excess]
ew = _ew.encode(first_part)
lines[-1] += ew
to_encode = to_encode[len(first_part):]
to_encode = to_encode[len(encoded_first_part):]
if to_encode:
lines.append(' ')
new_last_ew = len(lines[-1])
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_email/test_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@ def test_adding_default_policies_preserves_default_factory(self):
email.policy.EmailPolicy.header_factory)
self.assertEqual(newpolicy.__dict__, {'raise_on_defect': True})

def test_non_ascii_policy(self):
policy = email.policy.default
msg = email.message.EmailMessage()
msg["Subject"] = "á"*100
res = policy.fold("Subject", msg["Subject"])
self.assertEqual(len(res), 304)
# XXX: Need subclassing tests.
# For adding subclassed objects, make sure the usual rules apply (subclass
# wins), but that the order still works (right overrides left).
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-06-17-20-28-27.bpo-33529.uoCjry.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix infinite loop on folding email if headers has no spaces with non-ascii
characters and a size of value is over 78