Change all our uses of CRYPTO_THREAD_run_once to use RUN_ONCE instead

[openssl.git] / crypto / engine / eng_init.c

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index c51a38dac0cfdefa33e3f885a4fb2d2246828fcd..8be7c6fc8658b69d0997db69545bce35bf3e1dfe 100644 (file)
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -80,7 +80,10 @@ int ENGINE_init(ENGINE *e)
         ENGINEerr(ENGINE_F_ENGINE_INIT, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
-    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_INIT, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
     CRYPTO_THREAD_write_lock(global_engine_lock);
     ret = engine_unlocked_init(e);
     CRYPTO_THREAD_unlock(global_engine_lock);