Fix memory leak in crltest error case

[openssl.git] / test / crltest.c

diff --git a/test/crltest.c b/test/crltest.c
index 048f67fec5731a81eaa5a7d6cce08f99d52a9946..738ca23ce571e667654091b8f238f6dfd2d52c6f 100644 (file)
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../e_os.h"
+#include "internal/nelem.h"
 #include <string.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
@@ -267,6 +267,7 @@ static int verify(X509 *leaf, X509 *root, STACK_OF(X509_CRL) *crls,
     if (flags)
         X509_VERIFY_PARAM_set_flags(param, flags);
     X509_STORE_CTX_set0_param(ctx, param);
+    param = NULL;
 
     ERR_clear_error();
     status = X509_verify_cert(ctx) == 1 ? X509_V_OK
@@ -274,6 +275,7 @@ static int verify(X509 *leaf, X509 *root, STACK_OF(X509_CRL) *crls,
 err:
     sk_X509_pop_free(roots, X509_free);
     sk_X509_CRL_pop_free(crls, X509_CRL_free);
+    X509_VERIFY_PARAM_free(param);
     X509_STORE_CTX_free(ctx);
     X509_STORE_free(store);
     return status;
@@ -364,23 +366,22 @@ static int test_unknown_critical_crl(int n)
     return r;
 }
 
-int test_main(int argc, char *argv[])
+int setup_tests(void)
 {
-    int status = EXIT_FAILURE;
-
     if (!TEST_ptr(test_root = X509_from_strings(kCRLTestRoot))
         || !TEST_ptr(test_leaf = X509_from_strings(kCRLTestLeaf)))
-        goto err;
+        return 0;
 
     ADD_TEST(test_no_crl);
     ADD_TEST(test_basic_crl);
     ADD_TEST(test_bad_issuer_crl);
     ADD_TEST(test_known_critical_crl);
     ADD_ALL_TESTS(test_unknown_critical_crl, OSSL_NELEM(unknown_critical_crls));
+    return 1;
+}
 
-    status = run_tests(argv[0]);
-err:
+void cleanup_tests(void)
+{
     X509_free(test_root);
     X509_free(test_leaf);
-    return status;
 }