From 2a37a8b1cc8796e4c86786017414f919dbaa6fac Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 21 Sep 2015 17:01:26 -0700
Subject: [PATCH] Add cleanup to LLCore prevent occasional crash on exit.
---
indra/llcorehttp/httpcommon.cpp | 17 +++++++++++++++++
indra/llcorehttp/httpcommon.h | 1 +
indra/newview/llappviewer.cpp | 1 +
3 files changed, 19 insertions(+)
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index c606f2b7542..c423047bb08 100755
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -350,6 +350,11 @@ void deallocateEasyCurl(CURL *curlp)
//static
void ssl_locking_callback(int mode, int type, const char *file, int line)
{
+ if (type >= sSSLMutex.size())
+ {
+ LL_WARNS() << "Attempt to get unknown MUTEX in SSL Lock." << LL_ENDL;
+ }
+
if (mode & CRYPTO_LOCK)
{
sSSLMutex[type]->lock();
@@ -392,6 +397,18 @@ void initialize()
}
+void cleanup()
+{
+#if SAFE_SSL
+ CRYPTO_set_id_callback(NULL);
+ CRYPTO_set_locking_callback(NULL);
+ sSSLMutex.clear();
+#endif
+
+ curl_global_cleanup();
+}
+
+
CURL_ptr createEasyHandle()
{
LLMutexLock lock(getCurlMutex());
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 3e98600a926..1bc20fe6b56 100755
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -497,6 +497,7 @@ namespace LLHttp
typedef boost::shared_ptr<CURL> CURL_ptr;
void initialize();
+ void cleanup();
CURL_ptr createEasyHandle();
std::string getCURLVersion();
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5cf9efa04e3..44c9f893b8e 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2077,6 +2077,7 @@ bool LLAppViewer::cleanup()
}
LL_INFOS() << "Cleaning up LLProxy." << LL_ENDL;
LLProxy::cleanupClass();
+ LLCore::LLHttp::cleanup();
LLWearableType::cleanupClass();
--
GitLab