[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1d2932de4cefcc200f175863a42c311916269981 (commit)
      from  7b4a4b71b52c704580f5ef043017f06d4fb97e7e (commit)


- Log -----------------------------------------------------------------
commit 1d2932de4cefcc200f175863a42c311916269981
Author: Eric Dequin <Dequin_Eric at emc.com>
Date:   Thu Feb 12 10:44:30 2015 -0500

    Missing OPENSSL_free on error path.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/t1_enc.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 0c49619..7333ba9 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -649,6 +649,7 @@ int tls1_setup_key_block(SSL *s)
 
     if ((p2 = (unsigned char *)OPENSSL_malloc(num)) == NULL) {
         SSLerr(SSL_F_TLS1_SETUP_KEY_BLOCK, ERR_R_MALLOC_FAILURE);
+        OPENSSL_free(p1);
         goto err;
     }
 #ifdef TLS_DEBUG