[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  378db52bb0177ae03cac3c3ba194bb6dec34a2d7 (commit)
      from  8a8d9e190533ee41e8b231b18c7837f98f1ae231 (commit)


- Log -----------------------------------------------------------------
commit 378db52bb0177ae03cac3c3ba194bb6dec34a2d7
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Nov 27 14:11:36 2017 -0500

    Check for malloc failure
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4805)

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

Summary of changes:
 crypto/cms/cms_sd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 7647816..ff2d540 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -714,8 +714,10 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
     md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
     if (md == NULL)
         return -1;
-    if (si->mctx == NULL)
-        si->mctx = EVP_MD_CTX_new();
+    if (si->mctx == NULL && (si->mctx = EVP_MD_CTX_new()) == NULL) {
+        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, ERR_R_MALLOC_FAILURE);
+        return -1;
+    }
     mctx = si->mctx;
     if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0)
         goto err;