Skip to content

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

Merged
ned-deily merged 1 commit intopython:3.6from
miss-islington:backport-f69d5c6-3.6
Jul 21, 2019
Merged

[3.6] bpo-36564: Fix infinite loop in email folding logic (GH-12732)#14799
ned-deily merged 1 commit intopython:3.6from
miss-islington:backport-f69d5c6-3.6

Conversation

@miss-islington
Copy link
Copy Markdown
Contributor

@miss-islington miss-islington commented Jul 16, 2019 •
edited by bedevere-bot
Loading

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

@pganssle @miss-islington
Fix infinite loop in email folding logic (pythonGH-12732)
0bff801 
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>
@bedevere-bot bedevere-bot mentioned this pull request Jul 16, 2019
Merged
@bedevere-bot bedevere-bot added the type-security A security issue label Jul 16, 2019
@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
Copy link
Copy Markdown
Member

warsaw commented Jul 16, 2019

@ned-deily

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Jul 16, 2019

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

@warsaw
Copy link
Copy Markdown
Member

warsaw commented Jul 16, 2019

@maxking

@maxking
Copy link
Copy Markdown
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
Copy link
Copy Markdown
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
Copy link
Copy Markdown
Contributor Author

miss-islington commented Jul 17, 2019

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

@miss-islington
Copy link
Copy Markdown
Contributor 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
@miss-islington miss-islington deleted the backport-f69d5c6-3.6 branch July 21, 2019 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@warsaw warsaw warsaw approved these changes

Assignees

No one assigned

Labels

type-security A security issue

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@miss-islington @warsaw @maxking @ned-deily @the-knights-who-say-ni @bedevere-bot @pganssle