[Python-checkins] closes bpo-41235: Fix the error handling in SSLContext.load_dh_params() (GH-21385)

Miss Islington (bot) webhook-mailer at python.org
Wed Jul 8 00:37:58 EDT 2020


https://github.com/python/cpython/commit/c8b599ff0a4e4782e97e353a20146d3570845dbc
commit: c8b599ff0a4e4782e97e353a20146d3570845dbc
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-07-07T21:37:50-07:00
summary:

closes bpo-41235: Fix the error handling in SSLContext.load_dh_params() (GH-21385)

(cherry picked from commit aebc0495572c5bb85d2bd97d27cf93ab038b5a6a)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-07-07-21-56-26.bpo-41235.H2csMU.rst
M Modules/_ssl.c

diff --git a/Misc/NEWS.d/next/Library/2020-07-07-21-56-26.bpo-41235.H2csMU.rst b/Misc/NEWS.d/next/Library/2020-07-07-21-56-26.bpo-41235.H2csMU.rst
new file mode 100644
index 0000000000000..c55275bb1c622
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-07-21-56-26.bpo-41235.H2csMU.rst
@@ -0,0 +1 @@
+Fix the error handling in :meth:`ssl.SSLContext.load_dh_params`.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 9fbaecb80739f..8ee2c170368fd 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4312,8 +4312,10 @@ _ssl__SSLContext_load_dh_params(PySSLContext *self, PyObject *filepath)
         }
         return NULL;
     }
-    if (SSL_CTX_set_tmp_dh(self->ctx, dh) == 0)
-        _setSSLError(NULL, 0, __FILE__, __LINE__);
+    if (!SSL_CTX_set_tmp_dh(self->ctx, dh)) {
+        DH_free(dh);
+        return _setSSLError(NULL, 0, __FILE__, __LINE__);
+    }
     DH_free(dh);
     Py_RETURN_NONE;
 }



More information about the Python-checkins mailing list