Repository navigation
gh-158313: Clear the OpenSSL error queue when ssl raises OSError - #158333
Open
lazerg wants to merge 1 commit into
Open
lazerg wants to merge 1 commit into
lazerg wants to merge 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The two ERR_LIB_SYS branches in PySSL_SetError return early and skip the ERR_clear_error() call that every other path makes. The entry then stays on the thread's error queue, and SSL_get_error() picks it up on the next I/O call on any socket in that thread, so the same OSError is raised again and again. This clears the queue in both branches, like the e == 0 branch already does.
The test fails on main with BrokenPipeError from the second connection.
Fixes #158313