summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Mraz <tmraz@fedoraproject.org>2020-10-20 14:16:30 +0200
committerTomas Mraz <tmraz@fedoraproject.org>2020-10-20 14:16:30 +0200
commit7b324bb09f6313b370954fde8f2034a6055d8c2f (patch)
tree659c079fa83ab6aa5a71785d26b405a8c29553e4
parented7cdb954e96d463add20f584f5e7ce99560af27 (diff)
Avoid potential doublefree on dh object assigned to EVP_PKEY
Fixes regression from 7844f3c784bfc93c9b94ae5a4082f9d01e82e0af Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13194)
-rw-r--r--ssl/statem/statem_clnt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 3bf8aacfc0..fd3b79c4ef 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2150,6 +2150,7 @@ static int tls_process_ske_dhe(SSL *s, PACKET *pkt, EVP_PKEY **pkey)
ERR_R_EVP_LIB);
goto err;
}
+ dh = NULL;
if (!ssl_security(s, SSL_SECOP_TMP_DH, EVP_PKEY_security_bits(peer_tmp),
0, peer_tmp)) {