From: Pauli <ppzgs1@gmail.com>
Date: Thu, 18 Mar 2021 03:04:21 +0000 (+1000)
Subject: apps: fix Coverity 1472670 & 1472685: resource leaks
X-Git-Tag: openssl-3.0.0-alpha14~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77b8b49bdd01e2b1162b337941ebc70fef7030c1;p=thirdparty%2Fopenssl.git

apps: fix Coverity 1472670 & 1472685: resource leaks

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14596)
---

diff --git a/apps/ocsp.c b/apps/ocsp.c
index e77c90f041d..bd509d98a76 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -241,14 +241,10 @@ int ocsp_main(int argc, char **argv)
     unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
     OPTION_CHOICE o;
 
-    reqnames = sk_OPENSSL_STRING_new_null();
-    if (reqnames == NULL)
+    if ((reqnames = sk_OPENSSL_STRING_new_null()) == NULL
+            || (ids = sk_OCSP_CERTID_new_null()) == NULL
+            || (vpm = X509_VERIFY_PARAM_new()) == NULL)
         goto end;
-    ids = sk_OCSP_CERTID_new_null();
-    if (ids == NULL)
-        goto end;
-    if ((vpm = X509_VERIFY_PARAM_new()) == NULL)
-        return 1;
 
     prog = opt_init(argc, argv, ocsp_options);
     while ((o = opt_next()) != OPT_EOF) {