From 91a5c0e40cf272d18b65c9e4c9a0268f244758a8 Mon Sep 17 00:00:00 2001 From: Pauli Date: Thu, 12 Oct 2023 08:46:19 +1100 Subject: [PATCH] cmp: add null pointer check in tear_down test function problem reported by: 2ourc3 Reviewed-by: Shane Lontis Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/22355) --- test/cmp_protect_test.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c index 0d2311fc29c..89f342458ec 100644 --- a/test/cmp_protect_test.c +++ b/test/cmp_protect_test.c @@ -38,15 +38,17 @@ static OSSL_PROVIDER *default_null_provider = NULL, *provider = NULL; static void tear_down(CMP_PROTECT_TEST_FIXTURE *fixture) { - OSSL_CMP_CTX_free(fixture->cmp_ctx); - OSSL_CMP_MSG_free(fixture->msg); - OSSL_CMP_PKISI_free(fixture->si); + if (fixture != NULL) { + OSSL_CMP_CTX_free(fixture->cmp_ctx); + OSSL_CMP_MSG_free(fixture->msg); + OSSL_CMP_PKISI_free(fixture->si); - OPENSSL_free(fixture->mem); - sk_X509_free(fixture->certs); - sk_X509_free(fixture->chain); + OPENSSL_free(fixture->mem); + sk_X509_free(fixture->certs); + sk_X509_free(fixture->chain); - OPENSSL_free(fixture); + OPENSSL_free(fixture); + } } static CMP_PROTECT_TEST_FIXTURE *set_up(const char *const test_case_name) -- 2.47.3