[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  21311777ad8b8c2f2fb8eb7a4f9618ceae1e043d (commit)
      from  41349b5e6dbd72bfbeaf3cf189d64914240628e3 (commit)


- Log -----------------------------------------------------------------
commit 21311777ad8b8c2f2fb8eb7a4f9618ceae1e043d
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Oct 23 16:30:20 2018 +0200

    Fix a possible crash in rand_drbg_get_entropy
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7474)

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

Summary of changes:
 crypto/rand/rand_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index e6fcbce..29d93a8 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -151,6 +151,8 @@ size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
         pool->entropy_requested = entropy;
     } else {
         pool = rand_pool_new(entropy, min_len, max_len);
+        if (pool == NULL)
+            return 0;
     }
 
     if (drbg->parent) {