diff options
Diffstat (limited to 'crypto/engine/eng_list.c')
| -rw-r--r-- | crypto/engine/eng_list.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index a7252e930b..934389f74e 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -136,7 +136,11 @@ ENGINE *ENGINE_get_first(void) { ENGINE *ret; - CRYPTO_THREAD_run_once(&engine_lock_init, do_engine_lock_init); + if (!RUN_ONCE(&engine_lock_init, do_engine_lock_init)) { + ENGINEerr(ENGINE_F_ENGINE_GET_FIRST, ERR_R_MALLOC_FAILURE); + return NULL; + } + CRYPTO_THREAD_write_lock(global_engine_lock); ret = engine_list_head; if (ret) { @@ -151,7 +155,11 @@ ENGINE *ENGINE_get_last(void) { ENGINE *ret; - CRYPTO_THREAD_run_once(&engine_lock_init, do_engine_lock_init); + if (!RUN_ONCE(&engine_lock_init, do_engine_lock_init)) { + ENGINEerr(ENGINE_F_ENGINE_GET_LAST, ERR_R_MALLOC_FAILURE); + return NULL; + } + CRYPTO_THREAD_write_lock(global_engine_lock); ret = engine_list_tail; if (ret) { @@ -279,7 +287,11 @@ ENGINE *ENGINE_by_id(const char *id) ENGINEerr(ENGINE_F_ENGINE_BY_ID, ERR_R_PASSED_NULL_PARAMETER); return NULL; } - CRYPTO_THREAD_run_once(&engine_lock_init, do_engine_lock_init); + if (!RUN_ONCE(&engine_lock_init, do_engine_lock_init)) { + ENGINEerr(ENGINE_F_ENGINE_BY_ID, ERR_R_MALLOC_FAILURE); + return NULL; + } + CRYPTO_THREAD_write_lock(global_engine_lock); iterator = engine_list_head; while (iterator && (strcmp(id, iterator->id) != 0)) |