diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-12-08 14:14:48 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-12-09 19:25:29 +0100 |
| commit | 907b966981a1d6f1e1fcbf0ab752e040a49f1475 (patch) | |
| tree | 2f46fbe7d20bdef747001620bc510fa9ef6d3d98 /crypto/objects | |
| parent | 93838762b406efe3aad9c807a0fd1f48e6efe3ab (diff) | |
| download | openssl-907b966981a1d6f1e1fcbf0ab752e040a49f1475.zip openssl-907b966981a1d6f1e1fcbf0ab752e040a49f1475.tar.gz openssl-907b966981a1d6f1e1fcbf0ab752e040a49f1475.tar.bz2 | |
Minor code cleanup in o_names_init
This might result in a small memory leak.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17238)
(cherry picked from commit c50bf14450f3cd242f2211ca7e500191053d8050)
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/o_names.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 05aa8c4..92152ee 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -66,8 +66,14 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b); static CRYPTO_ONCE init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(o_names_init) { - names_lh = lh_OBJ_NAME_new(obj_name_hash, obj_name_cmp); + names_lh = NULL; obj_lock = CRYPTO_THREAD_lock_new(); + if (obj_lock != NULL) + names_lh = lh_OBJ_NAME_new(obj_name_hash, obj_name_cmp); + if (names_lh == NULL) { + CRYPTO_THREAD_lock_free(obj_lock); + obj_lock = NULL; + } return names_lh != NULL && obj_lock != NULL; } |