Commit 3ac6d5ee authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Fix the fall-out in 04-test_bioprint.t 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3712)
parent af6de400

crypto/init.c

+10 −2
Original line number Diff line number Diff line
@@ -43,7 +43,10 @@ static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc) 


    if (local == NULL && alloc) {

        local = OPENSSL_zalloc(sizeof *local);

        CRYPTO_THREAD_set_local(&threadstopkey, local);

        if (local != NULL && !CRYPTO_THREAD_set_local(&threadstopkey, local)) {

            OPENSSL_free(local);

            return NULL;

        }

    }

    if (!alloc) {

        CRYPTO_THREAD_set_local(&threadstopkey, NULL);
@@ -359,7 +362,12 @@ void OPENSSL_thread_stop(void) 


int ossl_init_thread_start(uint64_t opts)

{

    struct thread_local_inits_st *locals = ossl_init_get_thread_local(1);

    struct thread_local_inits_st *locals;



    if (!OPENSSL_init_crypto(0, NULL))

        return 0;



    locals = ossl_init_get_thread_local(1);



    if (locals == NULL)

        return 0;