[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b0333e697c008d639c56f48e9148cb8cba957e32 (commit)
      from  5006c32253483ba232dd441c28624801195cd7b5 (commit)


- Log -----------------------------------------------------------------
commit b0333e697c008d639c56f48e9148cb8cba957e32
Author: Graeme Perrow <graeme.perrow at sap.com>
Date:   Thu Feb 12 13:00:42 2015 -0500

    RT3670: Check return from BUF_MEM_grow_clean
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/conf/conf_def.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 59053e8..c8744e6 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -570,7 +570,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                 CONFerr(CONF_F_STR_COPY, CONF_R_VARIABLE_HAS_NO_VALUE);
                 goto err;
             }
-            BUF_MEM_grow_clean(buf, (strlen(p) + buf->length - (e - from)));
+            if (!BUF_MEM_grow_clean(buf,
+                        (strlen(p) + buf->length - (e - from)))) {
+                CONFerr(CONF_F_STR_COPY, ERR_R_MALLOC_FAILURE);
+                goto err;
+            }
             while (*p)
                 buf->data[to++] = *(p++);