From: Rich Salz <rsalz@akamai.com>
Date: Sun, 21 Jun 2015 19:37:53 +0000 (-0400)
Subject: RT3917: add cleanup on an error path
X-Git-Tag: OpenSSL_1_0_2d~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=44754511646614b0be4c53ac9f1893f5eca3ed64;p=oweals%2Fopenssl.git

RT3917: add cleanup on an error path

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 7fba8407cc72e09dbd8d768100617286b0740b03)
---

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index b39ed48998..5522a376ac 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)