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:42:59 +0000 (16:42 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/ssl_lib.c

index 743204cd153b027a8b7979f25f30c8d0d1a53947..a4d565fb4ab41054741e79bf5bce671c5c6d7413 100644 (file)
@@ -417,13 +417,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);
        }