From 38afaa48ec10d6256179b89639ce07ff57b7fe0d Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 4 Dec 2014 09:46:44 +0000 Subject: Fix memory leak in SSL_new if errors occur. Reviewed-by: Richard Levitte (cherry picked from commit 76e6509085ea96df0ca542568ee2596343711307) --- ssl/ssl_lib.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ssl/ssl_lib.c') diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ac40c6ac44..bd8cc68641 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -377,13 +377,7 @@ SSL *SSL_new(SSL_CTX *ctx) return(s); err: if (s != NULL) - { - if (s->cert != NULL) - ssl_cert_free(s->cert); - if (s->ctx != NULL) - SSL_CTX_free(s->ctx); /* decrement reference count */ - OPENSSL_free(s); - } + SSL_free(s); SSLerr(SSL_F_SSL_NEW,ERR_R_MALLOC_FAILURE); return(NULL); } -- cgit v1.2.3