diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-11-24 18:48:10 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-11-29 08:21:34 +0100 |
| commit | 92a25e24e6ec9735dea9ec645502cb075a5f8d24 (patch) | |
| tree | 480f7c3a97fd27f48bc2b85a407213daff15dc3a /crypto/property/property_local.h | |
| parent | 055d029610712a281aed0c23ddd3c8f4dbf40f80 (diff) | |
Fix occasional assertion failure when storing properties
Fixes #18631
The store lock does not prevent concurrent access to the
property cache, because there are multiple stores.
We drop the newly created entry and use the exisiting one
if there is one already.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19762)
Diffstat (limited to 'crypto/property/property_local.h')
| -rw-r--r-- | crypto/property/property_local.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h index 6b85ce1586..797fb3bf5f 100644 --- a/crypto/property/property_local.h +++ b/crypto/property/property_local.h @@ -52,4 +52,4 @@ int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query); /* Property definition cache functions */ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop); int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop, - OSSL_PROPERTY_LIST *pl); + OSSL_PROPERTY_LIST **pl); |