ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux).

1 files changed, 8 insertions, 6 deletions

diff --git a/indra/llplugin/llplugincookiestore.cpp b/indra/llplugin/llplugincookiestore.cpp
index 9ccd3a655b..9f4d65e723 100755
--- a/indra/llplugin/llplugincookiestore.cpp
+++ b/indra/llplugin/llplugincookiestore.cpp
@@ -679,12 +679,14 @@ void LLPluginCookieStore::removeCookiesByDomain(const std::string &domain)
 	{ 
 		if(iter->second->getDomain() == domain)
 		{
-			delete iter->second;
-			iter = mCookies.erase(iter);
-		}
-		else
-		{
-			++iter;
+            cookie_map_t::iterator doErase = iter;
+            iter++;
+			delete doErase->second;
+			mCookies.erase(doErase);
 		}
+        else
+        {
+            iter++;
+        }
 	}
 }