From 10453446b3a4dd72b90200ef61eac1c00ec12188 Mon Sep 17 00:00:00 2001
From: "James E. King, III" <jim.king@simplivity.com>
Date: Tue, 22 Sep 2015 14:33:42 -0400
Subject: [PATCH] THRIFT-2936: fix crash in memory handling if executable calls
 cleanupOpenSSL more than once

---
 lib/cpp/src/thrift/transport/TSSLSocket.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index c47995e0445..98c53267674 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -124,10 +124,9 @@ void cleanupOpenSSL() {
   CRYPTO_set_dynlock_create_callback(NULL);
   CRYPTO_set_dynlock_lock_callback(NULL);
   CRYPTO_set_dynlock_destroy_callback(NULL);
-  sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-  CRYPTO_cleanup_all_ex_data();
   ERR_free_strings();
   EVP_cleanup();
+  CRYPTO_cleanup_all_ex_data();
   ERR_remove_state(0);
   mutexes.reset();
 }