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

ZackerySpytz · web-flow · commit aebc0495572c · 2020-07-07T23:21:58.000-05:00
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
@@ -4309,8 +4309,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
`@@ -4309,8 +4309,10 @@ _ssl__SSLContext_load_dh_params(PySSLContext self, PyObject filepath)`
`4309`	`4309`	`}`
`4310`	`4310`	`return NULL;`
`4311`	`4311`	`}`
`4312`		`- if (SSL_CTX_set_tmp_dh(self->ctx, dh) == 0)`
`4313`		`- _setSSLError(NULL, 0, __FILE__, __LINE__);`
	`4312`	`+ if (!SSL_CTX_set_tmp_dh(self->ctx, dh)) {`
	`4313`	`+ DH_free(dh);`
	`4314`	`+ return _setSSLError(NULL, 0, __FILE__, __LINE__);`
	`4315`	`+ }`
`4314`	`4316`	`DH_free(dh);`
`4315`	`4317`	`Py_RETURN_NONE;`
`4316`	`4318`	`}`