[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  59099d6b8a3aec77f7d9f310ebf8e31b09c2d518 (commit)
      from  43a0449fe6ce18b750803be8a115a412a7235496 (commit)


- Log -----------------------------------------------------------------
commit 59099d6b8a3aec77f7d9f310ebf8e31b09c2d518
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 4 17:18:31 2017 +0200

    STORE: fix possible memory leak
    
    If scheme is NULL, the allocated res is leaked
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3841)

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

Summary of changes:
 crypto/store/store_register.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c
index 7af1925..b366b19 100644
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.c
@@ -30,12 +30,7 @@ DEFINE_RUN_ONCE_STATIC(do_registry_init)
 
 OSSL_STORE_LOADER *OSSL_STORE_LOADER_new(ENGINE *e, const char *scheme)
 {
-    OSSL_STORE_LOADER *res = OPENSSL_zalloc(sizeof(*res));
-
-    if (res == NULL) {
-        OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_LOADER_NEW, ERR_R_MALLOC_FAILURE);
-        return NULL;
-    }
+    OSSL_STORE_LOADER *res = NULL;
 
     /*
      * We usually don't check NULL arguments.  For loaders, though, the
@@ -49,6 +44,11 @@ OSSL_STORE_LOADER *OSSL_STORE_LOADER_new(ENGINE *e, const char *scheme)
         return NULL;
     }
 
+    if ((res = OPENSSL_zalloc(sizeof(*res))) == NULL) {
+        OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_LOADER_NEW, ERR_R_MALLOC_FAILURE);
+        return NULL;
+    }
+
     res->engine = e;
     res->scheme = scheme;
     return res;