summaryrefslogtreecommitdiffstats
path: root/crypto/property/defn_cache.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/property/defn_cache.c')
-rw-r--r--crypto/property/defn_cache.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c
index 8007599526..920dbdc096 100644
--- a/crypto/property/defn_cache.c
+++ b/crypto/property/defn_cache.c
@@ -85,6 +85,11 @@ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
return r != NULL ? r->defn : NULL;
}
+/*
+ * Cache the property list for a given property string. Callers of this function
+ * should call ossl_prop_defn_get first to ensure that there is no existing
+ * cache entry for this property string.
+ */
int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
OSSL_PROPERTY_LIST *pl)
{
@@ -116,8 +121,14 @@ int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
p->defn = pl;
memcpy(p->body, prop, len + 1);
old = lh_PROPERTY_DEFN_ELEM_insert(property_defns, p);
- if (old != NULL) {
- property_defn_free(old);
+ if (!ossl_assert(old == NULL)) {
+ /*
+ * This should not happen. Any caller of ossl_prop_defn_set should
+ * have called ossl_prop_defn_get first - so we should know that
+ * there is no existing entry. If we get here we have a bug. We
+ * deliberately leak the |old| reference in order to avoid a crash
+ * if there are any existing users of it.
+ */
goto end;
}
if (!lh_PROPERTY_DEFN_ELEM_error(property_defns))