[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a26dd465b21d8def440c16b6bd90227b03e12e02 (commit)
      from  97ea1e7f42eea97b117af08b3c1d29f6443850ab (commit)


- Log -----------------------------------------------------------------
commit a26dd465b21d8def440c16b6bd90227b03e12e02
Author: Todd Short <tshort at akamai.com>
Date:   Mon Jan 22 14:30:24 2018 -0500

    Fix error-path memory leak in asn_mime.c
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5142)

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

Summary of changes:
 crypto/asn1/asn_mime.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 936c8a5..2faff45 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -425,6 +425,7 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it)
             || hdr->value == NULL) {
             sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
             ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_NO_SIG_CONTENT_TYPE);
+            sk_BIO_pop_free(parts, BIO_vfree);
             return NULL;
         }