Fix memory leak in SSL_new if errors occur.
authorMatt Caswell <matt@openssl.org>
Thu, 4 Dec 2014 09:46:44 +0000 (09:46 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 8 Dec 2014 16:51:01 +0000 (16:51 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 76e6509085ea96df0ca542568ee2596343711307)

ssl/ssl_lib.c

index ac40c6ac44ebc7f59f86c765100b825e108408bd..bd8cc686417816ff1eaff707e8a8e3aba9150304 100644 (file)
@@ -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);
        }