Skip to content

Conversation

@zooba
Copy link
Member

@zooba zooba commented Jun 4, 2019

@zooba
Copy link
Member Author

zooba commented Jun 4, 2019

@ambv This is a security fix for a bug that hasn't been released yet - can we merge it before b1 and avoid having to create a new CVE?

@ambv ambv merged commit 8d0ef0b into python:master Jun 4, 2019
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link

@ambv: Please replace # with GH- in the commit message next time. Thanks!

@bedevere-bot
Copy link

GH-13813 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 4, 2019
…H-13812)

(cherry picked from commit 8d0ef0b)

Co-authored-by: Steve Dower <steve.dower@python.org>
@bedevere-bot
Copy link

GH-13814 is a backport of this pull request to the 3.6 branch.

@miss-islington
Copy link
Contributor

Sorry, @zooba and @ambv, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8d0ef0b5edeae52960c7ed05ae8a12388324f87e 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 4, 2019
…H-13812)

(cherry picked from commit 8d0ef0b)

Co-authored-by: Steve Dower <steve.dower@python.org>
@bedevere-bot
Copy link

GH-13815 is a backport of this pull request to the 2.7 branch.

miss-islington added a commit that referenced this pull request Jun 4, 2019
(cherry picked from commit 8d0ef0b)

Co-authored-by: Steve Dower <steve.dower@python.org>
@zooba zooba deleted the bpo-36742 branch June 4, 2019 16:41
ned-deily pushed a commit that referenced this pull request Jun 4, 2019
… (GH-13814)

(cherry picked from commit 8d0ef0b)

Co-authored-by: Steve Dower <steve.dower@python.org>
larryhastings pushed a commit that referenced this pull request Sep 7, 2019
… (GH-13814) (#14772)

(cherry picked from commit 8d0ef0b)

Co-authored-by: Steve Dower <steve.dower@python.org>
(cherry picked from commit fd1771d)
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants