[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  44754511646614b0be4c53ac9f1893f5eca3ed64 (commit)
      from  220b9519eb48c5e3f969123508976f777f897330 (commit)


- Log -----------------------------------------------------------------
commit 44754511646614b0be4c53ac9f1893f5eca3ed64
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>
    (cherry picked from commit 7fba8407cc72e09dbd8d768100617286b0740b03)

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

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 b39ed48..5522a37 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -374,7 +374,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;
@@ -405,6 +405,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
     else
         BIO_free_all(cmsbio);
 
+ err2:
     if (cms_certs)
         sk_X509_pop_free(cms_certs, X509_free);
     if (crls)