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

miss-islington · ZackerySpytz · web-flow · commit c8c818b0d736 · 2020-07-07T23:55:36.000-05:00
(cherry picked from commit aebc049) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
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
@@ -0,0 +1 @@
+Fix the error handling in :meth:`ssl.SSLContext.load_dh_params`.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -4189,8 +4189,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix the error handling in :meth:`ssl.SSLContext.load_dh_params`.
Original file line number	Diff line number	Diff line change
`@@ -4189,8 +4189,10 @@ _ssl__SSLContext_load_dh_params(PySSLContext self, PyObject filepath)`
`4189`	`4189`	`}`
`4190`	`4190`	`return NULL;`
`4191`	`4191`	`}`
`4192`		`- if (SSL_CTX_set_tmp_dh(self->ctx, dh) == 0)`
`4193`		`- _setSSLError(NULL, 0, __FILE__, __LINE__);`
	`4192`	`+ if (!SSL_CTX_set_tmp_dh(self->ctx, dh)) {`
	`4193`	`+ DH_free(dh);`
	`4194`	`+ return _setSSLError(NULL, 0, __FILE__, __LINE__);`
	`4195`	`+ }`
`4194`	`4196`	`DH_free(dh);`
`4195`	`4197`	`Py_RETURN_NONE;`
`4196`	`4198`	`}`