From: Matt Caswell <matt@openssl.org>
Date: Wed, 27 Apr 2016 13:46:09 +0000 (+0100)
Subject: Free memory on error in cms app
X-Git-Tag: OpenSSL_1_1_0-pre6~611
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e4ab54b93a161bed3d668315b13359b883caca4;p=oweals%2Fopenssl.git

Free memory on error in cms app

The make_receipt_request() function in the cms app can leak memory on
an error condition.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/apps/cms.c b/apps/cms.c
index 3a9b7af7b9..ad771d2d85 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1240,7 +1240,7 @@ static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING)
                                                 *rr_to, int rr_allorfirst, STACK_OF(OPENSSL_STRING)
                                                 *rr_from)
 {
-    STACK_OF(GENERAL_NAMES) *rct_to, *rct_from;
+    STACK_OF(GENERAL_NAMES) *rct_to = NULL, *rct_from = NULL;
     CMS_ReceiptRequest *rr;
     rct_to = make_names_stack(rr_to);
     if (!rct_to)
@@ -1255,6 +1255,7 @@ static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING)
                                     rct_to);
     return rr;
  err:
+    sk_GENERAL_NAMES_pop_free(rct_to, GENERAL_NAMES_free);
     return NULL;
 }