Skip to content
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.

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

[3.6] bpo-36564: Fix infinite loop in email folding logic (GH-12732) #14799

Merged
merged 1 commit into from Jul 21, 2019

Conversation

@miss-islington
Copy link

miss-islington commented Jul 16, 2019

As far as I can tell, this infinite loop would be triggered if:

  1. The value being folded contains a single word (no spaces) longer than
    max_line_length
  2. The max_line_length is shorter than the encoding's name + 9
    characters.

bpo-36564: https://bugs.python.org/issue36564
(cherry picked from commit f69d5c6)

Co-authored-by: Paul Ganssle pganssle@users.noreply.github.com

https://bugs.python.org/issue36564

As far as I can tell, this infinite loop would be triggered if:

1. The value being folded contains a single word (no spaces) longer than
   max_line_length
2. The max_line_length is shorter than the encoding's name + 9
   characters.

bpo-36564: https://bugs.python.org/issue36564
(cherry picked from commit f69d5c6)

Co-authored-by: Paul Ganssle <pganssle@users.noreply.github.com>
@warsaw warsaw changed the title [3.6] Fix infinite loop in email folding logic (GH-12732) [3.6] bpo-36564: Fix infinite loop in email folding logic (GH-12732) Jul 16, 2019
@warsaw
warsaw approved these changes Jul 16, 2019
@warsaw

This comment has been minimized.

Copy link
Member

warsaw commented Jul 16, 2019

@miss-islington

This comment has been minimized.

Copy link
Author

miss-islington commented Jul 16, 2019

@pganssle and @warsaw: Status check is done, and it's a failure .

@warsaw

This comment has been minimized.

Copy link
Member

warsaw commented Jul 16, 2019

@maxking

This comment has been minimized.

Copy link
Contributor

maxking commented Jul 16, 2019

The failure is due to:

Build execution time has reached the maximum allowed time for your plan (60 minutes).

The Linux builds on Azure and Travis went through without any errors. Maybe we need to restart the build on Appveyor.

@ned-deily

This comment has been minimized.

Copy link
Member

ned-deily commented Jul 17, 2019

Thanks for looking into it. I wouldn’t worry about the failure. I will take a look and presumably merge the PR later when I’m back from holiday.

@miss-islington

This comment has been minimized.

Copy link
Author

miss-islington commented Jul 17, 2019

@pganssle and @warsaw: Status check is done, and it's a success .

@miss-islington

This comment has been minimized.

Copy link
Author

miss-islington commented Jul 17, 2019

Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://help.github.com/articles/about-protected-branches/ for more information..

@ned-deily ned-deily merged commit 79a47e2 into python:3.6 Jul 21, 2019
6 checks passed
6 checks passed
Azure Pipelines PR #20190716.28 succeeded
Details
bedevere/issue-number Issue number 36564 found
Details
bedevere/maintenance-branch-pr Valid maintenance branch PR title.
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington miss-islington deleted the miss-islington:backport-f69d5c6-3.6 branch Jul 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.