[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  344c271eb339fc2982e9a3584a94e51112d84584 (commit)
      from  7786005d0d30816fd3cd3ee4bad11bf520b1327a (commit)


- Log -----------------------------------------------------------------
commit 344c271eb339fc2982e9a3584a94e51112d84584
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Thu May 7 16:12:33 2015 -0400

    Add missing NULL check in X509V3_parse_list()
    
    Matt's note: I added a call to X509V3err to Kurt's original patch.
    
    RT#3840
    
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/x509v3/v3_utl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index debd807..c6aab4b 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -286,6 +286,10 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
     int state;
     /* We are going to modify the line so copy it first */
     linebuf = BUF_strdup(line);
+    if (linebuf == NULL) {
+        X509V3err(X509V3_F_X509V3_PARSE_LIST, ERR_R_MALLOC_FAILURE);
+        goto err;
+    }
     state = HDR_NAME;
     ntmp = NULL;
     /* Go through all characters */