From ae8307b98f95b38795714995d561d5efb4fbe4d4 Mon Sep 17 00:00:00 2001 From: David Kirchner Date: Wed, 19 Jun 2019 15:51:21 +0000 Subject: [PATCH] Fix segfault when siege exits after hitting SSL server Addresses https://github.com/JoeDog/siege/issues/109 for siege 4.0.2 --- src/ssl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 4702d94..950e83b 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -221,16 +221,15 @@ SSL_thread_cleanup(void) OPENSSL_free(lock_count); lock_count=(long *)NULL; } - sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); - CRYPTO_cleanup_all_ex_data(); - ERR_remove_state(0); ERR_free_strings(); EVP_cleanup(); CRYPTO_cleanup_all_ex_data(); -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_USE_DEPRECATED) +#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(OPENSSL_USE_DEPRECATED) ERR_remove_state(0); -#else +#endif +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_USE_DEPRECATED) ERR_remove_thread_state(NULL); + SSL_COMP_free_compression_methods(); #endif }