]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-117310: Remove extra DECREF on "no ciphers" error path in `_ssl._SSLContext...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 28 Mar 2024 17:04:57 +0000 (18:04 +0100)
committerGitHub <noreply@github.com>
Thu, 28 Mar 2024 17:04:57 +0000 (10:04 -0700)
gh-117310: Remove extra DECREF on "no ciphers" error path in `_ssl._SSLContext` constructor (GH-117309)

Remove extra self DECREF on ssl "no ciphers" error path.

This doesn't come up in practice because nobody links against a broken
OpenSSL library that provides nothing.
(cherry picked from commit 8cb7d7ff86a1a2d41195f01ba4f218941dd7308c)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
Misc/NEWS.d/next/Library/2024-03-27-21-05-52.gh-issue-117310.Bt2wox.rst [new file with mode: 0644]
Modules/_ssl.c

diff --git a/Misc/NEWS.d/next/Library/2024-03-27-21-05-52.gh-issue-117310.Bt2wox.rst b/Misc/NEWS.d/next/Library/2024-03-27-21-05-52.gh-issue-117310.Bt2wox.rst
new file mode 100644 (file)
index 0000000..429b890
--- /dev/null
@@ -0,0 +1,4 @@
+Fixed an unlikely early & extra ``Py_DECREF`` triggered crash in :mod:`ssl`
+when creating a new ``_ssl._SSLContext`` if CPython was built implausibly such
+that the default cipher list is empty **or** the SSL library it was linked
+against reports a failure from its C ``SSL_CTX_set_cipher_list()`` API.
index 5f1425ae4640598be9bd43f306ea2adcfe760955..85fbc1628238e2beb21bf8828c3b46f63b99a8d6 100644 (file)
@@ -3143,7 +3143,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
         result = SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!eNULL");
     }
     if (result == 0) {
-        Py_DECREF(self);
         ERR_clear_error();
         PyErr_SetString(get_state_ctx(self)->PySSLErrorObject,
                         "No cipher can be selected.");