summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2023-10-12 08:46:19 +1100
committerTomas Mraz <tomas@openssl.org>2023-10-13 17:35:35 +0200
commitda6159e62f681ed7228bd326e314f74417858c6e (patch)
tree36a7b53f3e22b88f072fedd552b04909c9dbbd32
parent851f7bdd1ed2559e7d2a02c951be4082b3e596d1 (diff)
cmp: add null pointer check in tear_down test function
problem reported by: 2ourc3 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22355) (cherry picked from commit 91a5c0e40cf272d18b65c9e4c9a0268f244758a8)
-rw-r--r--test/cmp_protect_test.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c
index 03820c3406..fbf41347e4 100644
--- a/test/cmp_protect_test.c
+++ b/test/cmp_protect_test.c
@@ -37,15 +37,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)