commit 1d1c5743400bdf384ec83eb6ba5b39a355d121e3
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue Jul 07 21:40:18 2020 -0700
committer GitHub <noreply@github.com> Tue Jul 07 21:40:18 2020 -0700
tree 9713d4ee141671dc166a09d7da67df6f8e1d2f46
parent 366cfc65f26b159e44ee30917ab35afe59f8339f

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@gmail.com>

Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 5e82fe4..5806417 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4309,8 +4309,10 @@
         }
         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;
 }