[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b7b8e948014d93e1eb6d954d0799ae68ab0e068b (commit)
      from  399de49699d16e6e889d41dd08e82c94d43bc2bc (commit)


- Log -----------------------------------------------------------------
commit b7b8e948014d93e1eb6d954d0799ae68ab0e068b
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Wed Mar 9 15:25:07 2016 +0300

    Properly own the duplicated string
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/conf/conf_mod.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index cef805d..604518a 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -286,8 +286,13 @@ static CONF_MODULE *module_add(DSO *dso, const char *name,
     tmod->name = OPENSSL_strdup(name);
     tmod->init = ifunc;
     tmod->finish = ffunc;
+    if (tmod->name == NULL) {
+        OPENSSL_free(tmod);
+        return NULL;
+    }
 
     if (!sk_CONF_MODULE_push(supported_modules, tmod)) {
+        OPENSSL_free(tmod->name);
         OPENSSL_free(tmod);
         return NULL;
     }