From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 1 Aug 2015 14:37:44 +0000 (+0100)
Subject: Fix memory leak if setup fails.
X-Git-Tag: OpenSSL_1_1_0-pre1~820
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=891eac4604b5f05413e59602fae1f11136f4719a;p=oweals%2Fopenssl.git

Fix memory leak if setup fails.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index f9556acc2e..16b42251d1 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -194,7 +194,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
     ok = 1;
 
  err:
-    if (!keep_key) {
+    if (!keep_key || !ok) {
         OPENSSL_clear_free(ec->key, ec->keylen);
         ec->key = NULL;
     }