Fixing memory leak from OpenSSL when using websocket_client that occurrs per connection.

Author: stgates

Release/src/websockets/client/ws_client_wspp.cpp

@@ -168,6 +168,7 @@ class wspp_callback_client : public websocket_client_callback_impl, public std::
                 sslContext->set_default_verify_paths();
                 sslContext->set_options(boost::asio::ssl::context::default_workarounds);
                 sslContext->set_verify_mode(boost::asio::ssl::context::verify_peer);
+
 #if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || defined(_WIN32)
                 m_openssl_failed = false;
 #endif
@@ -191,6 +192,14 @@ class wspp_callback_client : public websocket_client_callback_impl, public std::
                     return rfc2818(preverified, verifyCtx);
                 });
 
+                // OpenSSL stores some per thread state that never will be cleaned up until
+                // the dll is unloaded. If static linking, like we do, the state isn't cleaned up
+                // at all and will be reported as leaks.
+                // See http://www.openssl.org/support/faq.html#PROG13
+                // This is necessary here because it is called on the user's thread calling connect(...)
+                // eventually through websocketpp::client::get_connection(...)
+                ERR_remove_thread_state(nullptr);
+
                 return sslContext;
             });
             return connect_impl<websocketpp::config::asio_tls_client>();
@@ -306,6 +315,12 @@ class wspp_callback_client : public websocket_client_callback_impl, public std::
 #if defined(__ANDROID__)
             crossplat::JVM.load()->DetachCurrentThread();
 #endif
+
+            // OpenSSL stores some per thread state that never will be cleaned up until
+            // the dll is unloaded. If static linking, like we do, the state isn't cleaned up
+            // at all and will be reported as leaks.
+            // See http://www.openssl.org/support/faq.html#PROG13
+            ERR_remove_thread_state(nullptr);
         });
         return pplx::create_task(m_connect_tce);
     }

Release/tests/common/TestRunner/test_runner.cpp

@@ -510,11 +510,11 @@ int main(int argc, char* argv[])
 {
 #ifdef _WIN32
     // Add standard error as output as well.
-    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW | _CRTDBG_MODE_DEBUG);
     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW | _CRTDBG_MODE_DEBUG);
     _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
     _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
 
     // The test runner built with WinRT support might be used on a pre Win8 machine.