Skip to content

gh-143756: Avoid borrowed reference in SSL code - #143816

Merged
colesbury merged 1 commit into
python:mainfrom
colesbury:gh-143756-weakref
Jan 22, 2026
Merged

gh-143756: Avoid borrowed reference in SSL code#143816
colesbury merged 1 commit into
python:mainfrom
colesbury:gh-143756-weakref

Conversation

@colesbury

@colesburycolesbury commented Jan 13, 2026•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Contributor

GET_SOCKET() returned a borrowed reference, which was potentially unsafe with free threading. Also, refactor out some common code.

@colesbury
pythongh-143756: Avoid borrowed reference in SSL code
28e9ed4
GET_SOCKET() returned a borrowed reference, which was potentially
unsafe. Also, refactor out some common code.
@bedevere-appbedevere-appBot mentioned this pull request Jan 13, 2026
Open
ZeroIntensity
ZeroIntensity approved these changes Jan 13, 2026
View reviewed changes
Comment threadModules/_ssl.c
Comment on lines +777 to +778
get_socket(PySSLSocket *obj, PySocketSockObject **out_sock,
const char *filename, int lineno)

@ZeroIntensityZeroIntensityJan 13, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would significantly simplify usage if this were a macro that automatically passed __FILE__ and __LINE__.

@picnixzpicnixzJan 19, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have a macro, AFAIR, it expands to something that will not be visually helpful (on the IDE the reported line would mismatch, but I may be wrong here).

So we also could well remove all file/lineno reports and add a description of what we were doing instead, or the involved function.

The file/lineno is only for us to know what happened when someone reports a bug. But the file is likely to always be the same...

picnixz
picnixz reviewed Jan 19, 2026
View reviewed changes
Comment threadModules/_ssl.c
picnixz
picnixz approved these changes Jan 20, 2026
View reviewed changes

@picnixzpicnixz left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The design choices of this module are hard to comply with but well... better to have small changes for now.

@colesbury
colesbury merged commit ee4e14a into python:mainJan 22, 2026
55 checks passed
@colesbury
colesbury deleted the gh-143756-weakref branch January 22, 2026 19:02
thunder-coding pushed a commit to thunder-coding/cpython that referenced this pull request Feb 15, 2026
@colesbury@thunder-coding
pythongh-143756: Avoid borrowed reference in SSL code (pythongh-143816)
26ecab6
GET_SOCKET() returned a borrowed reference, which was potentially
unsafe. Also, refactor out some common code.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@picnixzpicnixzpicnixz approved these changes
@ZeroIntensityZeroIntensityZeroIntensity approved these changes
@gpsheadgpsheadAwaiting requested review from gpsheadgpshead is a code owner

Assignees

No one assigned

Labels

skip newstopic-SSL

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@colesbury@picnixz@ZeroIntensity