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:48:05 +0000 (16:48 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 76e6509085ea96df0ca542568ee2596343711307)

ssl/ssl_lib.c

index f5c8ca9fec334f841559f3ddcce49b67f579d1c5..81f976a579e948153812745f0a631b3df7767e7d 100644 (file)
@@ -383,13 +383,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);
        }