summaryrefslogtreecommitdiffstats
path: root/crypto/err
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-03-26 20:01:44 +0200
committerRichard Levitte <levitte@openssl.org>2017-03-27 12:55:34 +0200
commit7dca72af91936d246700b78e06def16561a36028 (patch)
treefe46c8cd36fcd82b3d71e4c3d66375e2eb2f96ac /crypto/err
parentbe25316469eebf7e55cdcf3b5ded5edcf09a2723 (diff)
In err_cleanup(), cleanup the thread local storage too
Fixes #3033 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3035) (cherry picked from commit 165f1c3ef39680471339d21b9f6c12ea86b4a26a)
Diffstat (limited to 'crypto/err')
-rw-r--r--crypto/err/err.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 44a293ad42..d5cad0577e 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -259,6 +259,7 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
void err_cleanup(void)
{
+ CRYPTO_THREAD_cleanup_local(&err_thread_local);
CRYPTO_THREAD_lock_free(err_string_lock);
err_string_lock = NULL;
}