[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  143e5e50f22eaff58e90dd20bdb66eae6ab3b53e (commit)
      from  3577398360ba38a7dbfbedd8db9ebdd8eadce062 (commit)


- Log -----------------------------------------------------------------
commit 143e5e50f22eaff58e90dd20bdb66eae6ab3b53e
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Feb 11 09:12:33 2016 -0500

    Check malloc
    
    Noticed by Claus Assmann <ca+ssl-dev at esmtp.org>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/conf/conf_lib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 29357b2..a84b643 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -381,7 +381,8 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
 {
     OPENSSL_INIT_SETTINGS *ret = malloc(sizeof(*ret));
 
-    memset(ret, 0, sizeof(*ret));
+    if (ret != NULL)
+        memset(ret, 0, sizeof(*ret));
     return ret;
 }