summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfarrell <jfarrell@apache.org>2015-09-24 22:25:22 -0400
committerjfarrell <jfarrell@apache.org>2015-09-24 22:26:37 -0400
commit27be411ee0eb8799861262275c9745017031c3c4 (patch)
tree6e3fb58738b239fe8789ca610e5fd464c5749c0e
parentb121a586b20c801bb52aa423b2d0edddf5d3ce9e (diff)
downloadthrift-27be411ee0eb8799861262275c9745017031c3c4.tar.gz
THRIFT-2936:Minor memory leak in SSL
Client: cpp Patch: James King Thrift clients that use SSL leak 64 bytes in two chunks. This is because the list of available compression methods is not freed. This closes #619
-rw-r--r--lib/cpp/src/thrift/transport/TSSLSocket.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index c47995e04..98c532676 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();
}