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

Fix the error handling in ERR_get_state: 


- Ignoring the return code of ossl_init_thread_start created a memory leak.

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 9b579777

crypto/err/err.c

+3 −3
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ const char *ERR_reason_error_string(unsigned long e) 


void err_delete_thread_state(void)

{

    ERR_STATE *state = ERR_get_state();

    ERR_STATE *state = CRYPTO_THREAD_get_local(&err_thread_local);

    if (state == NULL)

        return;
@@ -682,14 +682,14 @@ ERR_STATE *ERR_get_state(void) 
        if (state == NULL)

            return NULL;



        if (!CRYPTO_THREAD_set_local(&err_thread_local, state)) {

        if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE)

            || !CRYPTO_THREAD_set_local(&err_thread_local, state)) {

            ERR_STATE_free(state);

            return NULL;

        }



        /* Ignore failures from these */

        OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);

        ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE);

    }



    return state;