39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 7455f247e6f9d621fa79ae3af1588df23078fb11 Mon Sep 17 00:00:00 2001
|
|
From: Benny Baumann <BenBE@geshi.org>
|
|
Date: Fri, 2 Oct 2020 01:06:12 +0200
|
|
Subject: [PATCH 079/147] Avoid memory leak of parent on allocation failure for
|
|
child structure
|
|
|
|
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
|
|
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
Reviewed-by: Paul Dale <paul.dale@oracle.com>
|
|
(Merged from https://github.com/openssl/openssl/pull/13055)
|
|
|
|
(cherry picked from commit a21db568bf3d0ab4194fd3e0917ee982f1fc8bfd)
|
|
---
|
|
apps/cms.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/apps/cms.c b/apps/cms.c
|
|
index 15edd67..60691f1 100644
|
|
--- a/apps/cms.c
|
|
+++ b/apps/cms.c
|
|
@@ -545,9 +545,11 @@ int cms_main(int argc, char **argv)
|
|
if (key_param == NULL || key_param->idx != keyidx) {
|
|
cms_key_param *nparam;
|
|
nparam = app_malloc(sizeof(*nparam), "key param buffer");
|
|
- nparam->idx = keyidx;
|
|
- if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL)
|
|
+ if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL) {
|
|
+ OPENSSL_free(nparam);
|
|
goto end;
|
|
+ }
|
|
+ nparam->idx = keyidx;
|
|
nparam->next = NULL;
|
|
if (key_first == NULL)
|
|
key_first = nparam;
|
|
--
|
|
1.8.3.1
|
|
|