From af6de400b49c011600cfd557319d1142da6e5cbd Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Mon, 19 Jun 2017 11:18:44 +0200 Subject: [PATCH] Fix the error handling in ERR_get_state: - Ignoring the return code of ossl_init_thread_start created a memory leak. Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3712) --- crypto/err/err.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/err/err.c b/crypto/err/err.c index c5991fdbbc..1c5d9e7279 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -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; -- 2.40.0