[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Kurt Roeckx]

The branch OpenSSL_1_0_2-stable has been updated
       via  0ecb682a674c69caee4b8da1c08d23305f484cd8 (commit)
      from  2045c58116c11c990eee009e29cf72fc92c47daa (commit)


- Log -----------------------------------------------------------------
commit 0ecb682a674c69caee4b8da1c08d23305f484cd8
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Thu Dec 22 10:12:03 2016 +0100

    Fix error handling in SSL_CTX_new
    
    Dont free rbuf_freelist here, SSL_CTX_free will do that.
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #2129

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_lib.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 42b980a..f8054da 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2030,10 +2030,8 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
     ret->rbuf_freelist->len = 0;
     ret->rbuf_freelist->head = NULL;
     ret->wbuf_freelist = OPENSSL_malloc(sizeof(SSL3_BUF_FREELIST));
-    if (!ret->wbuf_freelist) {
-        OPENSSL_free(ret->rbuf_freelist);
+    if (!ret->wbuf_freelist)
         goto err;
-    }
     ret->wbuf_freelist->chunklen = 0;
     ret->wbuf_freelist->len = 0;
     ret->wbuf_freelist->head = NULL;