mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Recycle the TLS key that holds thread_event_handler

Browse Source 
Fixes #25278

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25300)
This commit is contained in:
Zhihao Yuan 2024-08-26 18:48:36 -07:00 committed by Tomas Mraz
parent 09ae1c9f5a
commit 36840ab577
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/initthread.c
View File

@ -266,9 +266,8 @@ void *ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
if (tlocal == NULL) if (tlocal == NULL)
return NULL; return NULL;
if (!CRYPTO_THREAD_init_local(tlocal, NULL)) { if (!CRYPTO_THREAD_init_local(tlocal, NULL))
goto err; goto deinit;
}
hands = OPENSSL_zalloc(sizeof(*hands)); hands = OPENSSL_zalloc(sizeof(*hands));
if (hands == NULL) if (hands == NULL)
@ -290,12 +289,15 @@ void *ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
return tlocal; return tlocal;
err: err:
OPENSSL_free(hands); OPENSSL_free(hands);
CRYPTO_THREAD_cleanup_local(tlocal);
deinit:
OPENSSL_free(tlocal); OPENSSL_free(tlocal);
return NULL; return NULL;
} }
void ossl_thread_event_ctx_free(void *tlocal) void ossl_thread_event_ctx_free(void *tlocal)
{ {
CRYPTO_THREAD_cleanup_local(tlocal);
OPENSSL_free(tlocal); OPENSSL_free(tlocal);
} }