From 7dca72af91936d246700b78e06def16561a36028 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 26 Mar 2017 20:01:44 +0200
Subject: [PATCH] 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)
---
 crypto/err/err.c | 1 +
 1 file changed, 1 insertion(+)

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