[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  7dca72af91936d246700b78e06def16561a36028 (commit)
      from  be25316469eebf7e55cdcf3b5ded5edcf09a2723 (commit)


- Log -----------------------------------------------------------------
commit 7dca72af91936d246700b78e06def16561a36028
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 26 20:01:44 2017 +0200

    In err_cleanup(), cleanup the thread local storage too
    
    Fixes #3033
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3035)
    (cherry picked from commit 165f1c3ef39680471339d21b9f6c12ea86b4a26a)

-----------------------------------------------------------------------

Summary of changes:
 crypto/err/err.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 44a293a..d5cad05 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;
 }