[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  7fba8407cc72e09dbd8d768100617286b0740b03 (commit)
      from  8ca96efd24b73f917837fdd45b1c22d7b8ff8cbd (commit)


- Log -----------------------------------------------------------------
commit 7fba8407cc72e09dbd8d768100617286b0740b03
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun Jun 21 15:37:53 2015 -0400

    RT3917: add cleanup on an error path
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 0d97d3e..b33bc1d 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -386,7 +386,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
         tmpin = BIO_new_mem_buf(ptr, len);
         if (tmpin == NULL) {
             CMSerr(CMS_F_CMS_VERIFY, ERR_R_MALLOC_FAILURE);
-            return 0;
+            goto err2;
         }
     } else
         tmpin = dcont;
@@ -455,6 +455,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
     if (out != tmpout)
         BIO_free_all(tmpout);
 
+ err2:
     sk_X509_pop_free(cms_certs, X509_free);
     sk_X509_CRL_pop_free(crls, X509_CRL_free);