8000 gh-116810: fix memory leak in ssl module by jeffvanvoorst · Pull Request #123249 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-116810: fix memory leak in ssl module #123249

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Sep 30, 2024
Merged

gh-116810: fix memory leak in ssl module #123249

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
119d33a
gh-116810: fixed memory leak ssl module
jeffvanvoorst Aug 23, 2024
c98be51
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 23, 2024
e12cb28
Merge branch 'main' into ssl-bugfix-116810
jeffvanvoorst Aug 23, 2024
13196b4
Merge branch 'main' into ssl-bugfix-116810
jeffvanvoorst Aug 23, 2024
8fff948
Update Misc/NEWS.d/next/Library/2024-08-23-15-49-10.gh-issue-116810.Q…
jeffvanvoorst Aug 26, 2024
507266e
Merge branch 'main' into ssl-bugfix-116810
jeffvanvoorst Aug 26, 2024
c66f537
Merge branch 'main' into ssl-bugfix-116810
jeffvanvoorst Aug 26, 2024
45df217
Merge branch 'main' into ssl-bugfix-116810
jeffvanvoorst Aug 27, 2024
537c5bb
Make the NEWS entry more detailed.
gpshead Sep 19, 2024
0ddc1e2
Use the simpler `SSL_get1_session` API that CPython <=3.9 used on all…
gpshead Sep 19, 2024
46126b4
Call SSL_set_shutdown before SSL_free, remove session deecopy hack en…
pitrou Sep 19, 2024
7131837
Remove stale comment
pitrou Sep 19, 2024
5ced40b
Merge branch 'main' into ssl-bugfix-116810
pitrou Sep 19, 2024
96ab92b
expands news to mention the lack of internal serialization speedup.
gpshead Sep 19, 2024
cb415bc
per davidben, lets not clear a shutdown bit.
gpshead Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-08-23-15-49-10.gh-issue-116810.QLBUU8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Resolve a memory leak introduced in CPython 3.10's :mod:`ssl` when the
:attr:`ssl.SSLSocket.session` property was accessed.
12 changes: 3 additions & 9 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2844,15 +2844,9 @@ PySSL_get_session(PySSLSocket *self, void *closure) {
PySSLSession *pysess;
SSL_SESSION *session;

/* duplicate session as workaround for session bug in OpenSSL 1.1.0,
* https://github.com/openssl/openssl/issues/1550 */
session = SSL_get0_session(self->ssl); /* borrowed reference */
if (session == NULL) {
Py_RETURN_NONE;
}
if ((session = _ssl_session_dup(session)) == NULL) {
return NULL;
}
/* See discussion on https://github.com/python/cpython/pull/123249 and
* older discussion on https://github.com/openssl/openssl/issues/1550.
* CPython is NOT doing the right thing here. */
session = SSL_get1_session(self->ssl);
if (session == NULL) {
Py_RETURN_NONE;
Expand Down
Loading
0