Commit b7a7f39a authored by Richard Levitte's avatar Richard Levitte
Browse files

Stop init loops 



Under certain circumstances, the libcrypto init code would loop,
causing a deadlock.  This would typically happen if something in
ossl_init_base() caused an OpenSSL error, and the error stack routines
would recurse into the init code before the flag that ossl_init_base()
had been run was checked.

This change makes sure ossl_init_base isn't run once more of the base
is initiated.

Thanks to Dmitry Kostjuchenko for the idea.

Fixes Github issue #1899

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1922)
parent 1e19eacd

crypto/init.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) 
        return 0;

    }



    if (!RUN_ONCE(&base, ossl_init_base))

    if (!base_inited && !RUN_ONCE(&base, ossl_init_base))

        return 0;



    if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)