From: Richard Levitte <levitte@openssl.org>
Date: Sun, 26 Mar 2017 18:01:44 +0000 (+0200)
Subject: In err_cleanup(), cleanup the thread local storage too
X-Git-Tag: OpenSSL_1_1_1-pre1~1948
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=165f1c3ef39680471339d21b9f6c12ea86b4a26a

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)
---

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;
 }