[musicdb] fix the curlfile crash on exit properly this time

diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index da08473..216349c 100644 (file)
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -372,6 +372,7 @@ void CCurlFile::CReadState::Disconnect()
 
 CCurlFile::~CCurlFile()
 {
+  CSingleLock lock(s_hostMapLock);
   Close();
   delete m_state;
   g_curlInterface.Unload();
@@ -896,20 +897,33 @@ bool CCurlFile::Open(const CURL& url)
   CURL url2(url);
   ParseAndCorrectUrl(url2);
 
+  map<string, EndTime>::iterator it;
   // Rate-limit queries per domain to 1 per 2s
-  CSingleLock lock(s_hostMapLock);
-  map<string, EndTime>::iterator it = s_hostLastAccessTime.find(url2.GetHostName());
+  {
+    CSingleLock lock(s_hostMapLock);
+    it = s_hostLastAccessTime.find(url2.GetHostName());
+  }
   if (it != s_hostLastAccessTime.end())
   {
-    s_hostLastAccessTime.erase(it);
     if (!it->second.IsTimePast()) {
       CLog::Log(LOGDEBUG, "CurlFile::Open(%p) rate limiting queries to '%s' to avoid saturating, waiting %dmsec", (void*)this, it->first.c_str(), it->second.MillisLeft());
       Sleep(it->second.MillisLeft());
     }
+    {
+      CSingleLock lock(s_hostMapLock);
+      try {
+        s_hostLastAccessTime.erase(it);
+      }
+      catch (...)
+      {
+        CLog::Log(LOGERROR, "CurlFile::Open(%p) iterator invalidated while we were sleeping", (void*)this);
+      }
+    }
+  }
+  {
+    CSingleLock lock(s_hostMapLock);
+    s_hostLastAccessTime.insert(make_pair(url2.GetHostName(), EndTime(2000)));
   }
-  s_hostLastAccessTime.insert(make_pair(url2.GetHostName(), EndTime(1500)));
-  lock.Leave();
-
   CLog::Log(LOGDEBUG, "CurlFile::Open(%p) %s", (void*)this, m_url.c_str());
 
   ASSERT(!(!m_state->m_easyHandle ^ !m_state->m_multiHandle));