Complete the cleanup of an algorithm in OSSL_METHOD_STORE
The `alg_cleanup` didn't properly clear the OPENSSL_SA leaf that it
had just freed the contents of. Fortunately, `ossl_sa_ALGORITHM_doall_arg()`
allows us to pass the store pointer itself as an extra argument, which
allows a modified `alg_cleanup` to complete the job.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18151)
diff --git a/crypto/property/property.c b/crypto/property/property.c
index 4303b4b..d209f2c 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -205,14 +205,18 @@
lh_QUERY_flush(alg->cache);
}
-static void alg_cleanup(ossl_uintmax_t idx, ALGORITHM *a)
+static void alg_cleanup(ossl_uintmax_t idx, ALGORITHM *a, void *arg)
{
+ OSSL_METHOD_STORE *store = arg;
+
if (a != NULL) {
sk_IMPLEMENTATION_pop_free(a->impls, &impl_free);
lh_QUERY_doall(a->cache, &impl_cache_free);
lh_QUERY_free(a->cache);
OPENSSL_free(a);
}
+ if (store != NULL)
+ ossl_sa_ALGORITHM_set(store->algs, idx, NULL);
}
/*
@@ -242,7 +246,7 @@
void ossl_method_store_free(OSSL_METHOD_STORE *store)
{
if (store != NULL) {
- ossl_sa_ALGORITHM_doall(store->algs, &alg_cleanup);
+ ossl_sa_ALGORITHM_doall_arg(store->algs, &alg_cleanup, store);
ossl_sa_ALGORITHM_free(store->algs);
CRYPTO_THREAD_lock_free(store->lock);
OPENSSL_free(store);
@@ -332,7 +336,7 @@
err:
ossl_property_unlock(store);
- alg_cleanup(0, alg);
+ alg_cleanup(0, alg, NULL);
impl_free(impl);
return 0;
}