From: Matt Caswell <matt@openssl.org>
Date: Wed, 14 Mar 2018 14:32:48 +0000 (+0000)
Subject: Fix a memory leak in the ca application
X-Git-Tag: OpenSSL_1_1_1-pre3~69
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=01985122ae2b144cdd3a2061640e76bff491dc7f;p=oweals%2Fopenssl.git

Fix a memory leak in the ca application

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5444)
---

diff --git a/apps/ca.c b/apps/ca.c
index 743e48185b..d530cf5cd7 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1861,11 +1861,11 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     irow = NULL;
     ok = 1;
  end:
-    if (irow != NULL) {
+    if (ok != 1) {
         for (i = 0; i < DB_NUMBER; i++)
             OPENSSL_free(row[i]);
-        OPENSSL_free(irow);
     }
+    OPENSSL_free(irow);
 
     X509_NAME_free(CAname);
     X509_NAME_free(subject);