diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-14 21:28:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-14 22:15:32 +0100 |
| commit | 1ee7b8b97c90e8e59627bfcbda3714f18368a9e1 (patch) | |
| tree | 53a54a29d27fbdde8625fbfce8d230255a5fc020 /crypto/include | |
| parent | 6e08e9e7ccf00aba847351adc3b46b9dae1f114d (diff) | |
Fix ex_data locks issue
Travis identified a problem with freeing the ex_data locks which wasn't
quite right in ff2344052. Trying to fix it identified a further problem:
the ex_data locks are cleaned up by OPENSSL_cleanup(), which is called
explicitly by CRYPTO_mem_leaks(), but then later the BIO passed to
CRYPTO_mem_leaks() is freed. An attempt is then made to use the ex_data
lock already freed.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/include')
| -rw-r--r-- | crypto/include/internal/cryptlib_int.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h index fd68522936..a38ac18d1f 100644 --- a/crypto/include/internal/cryptlib_int.h +++ b/crypto/include/internal/cryptlib_int.h @@ -65,7 +65,6 @@ struct thread_local_inits_st { }; int ossl_init_thread_start(uint64_t opts); -void ex_data_cleanup(void); /* * OPENSSL_INIT flags. The primary list of these is in crypto.h. Flags below |