[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  f96ff4e908aec7403451d3fa7fc37239b351085a (commit)
      from  d288d7fc7beaa1d720a539d6ae27dba2c910ee68 (commit)


- Log -----------------------------------------------------------------
commit f96ff4e908aec7403451d3fa7fc37239b351085a
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Mar 16 15:32:25 2018 +0100

    Fixed a crash in error handing of rand_drbg_new
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/5646)

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

Summary of changes:
 crypto/rand/drbg_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index 360e775..02ad071 100644
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c
@@ -218,7 +218,7 @@ static RAND_DRBG *rand_drbg_new(int secure,
 
     if (drbg == NULL) {
         RANDerr(RAND_F_RAND_DRBG_NEW, ERR_R_MALLOC_FAILURE);
-        goto err;
+        return NULL;
     }
 
     drbg->secure = secure && CRYPTO_secure_allocated(drbg);