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

Jump to bottom

[3.9] bpo-41735: Fix thread locks in zlib module may go wrong in rare case #22130

Merged
merged 1 commit into from Apr 26, 2021
Merged

[3.9] bpo-41735: Fix thread locks in zlib module may go wrong in rare case #22130

merged 1 commit into from Apr 26, 2021

Conversation

animalize
Copy link
Contributor

@animalize animalize commented Sep 7, 2020 •
edited by bedevere-bot

@animalize
Fix thread locks in zlib module may go wrong in rare case
b3a3a81 
Setting `next_in` before acquiring the thread lock may mix up compress/decompress state in other threads.
@iritkatriel
Copy link
Member

iritkatriel commented Sep 7, 2020

backporting to branches other than master is automated, you don't need to create additional PRs for that.

@animalize
Copy link
Contributor Author

animalize commented Sep 7, 2020

backporting to branches other than master is automated, you don't need to create additional PRs for that.

There is a code conflict, a few hours ago zlib module was changed by another issue.

@iritkatriel
Copy link
Member

iritkatriel commented Sep 18, 2020

What I mean is that you shouldn't have created this PR and 22132. You only needed to create PR 22126. When a core reviewer approves PR 22126 they can choose to back port the change to other branches. They have buttons that do this.

So you only make PRs against master branch. Core reviewers backport them.

@animalize
Copy link
Contributor Author

animalize commented Sep 19, 2020

There is a code confilct, this line was added to master branch recently:

zlibstate *state = PyType_GetModuleState(cls);

@ambv ambv merged commit ba7338a into python:3.9 Apr 26, 2021
4 checks passed
@bedevere-bot
Copy link

bedevere-bot commented Apr 26, 2021

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

@animalize animalize deleted the thread_lock_3.9 branch Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@animalize @iritkatriel @bedevere-bot @ambv @the-knights-who-say-ni