Skip to content
Snippets Groups Projects
Commit 6e579437 authored by Richard Linden's avatar Richard Linden
Browse files

STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564

fixed crash on startup
parent c14d9b6e
No related branches found
No related tags found
No related merge requests found
...@@ -554,7 +554,7 @@ void LLAvatarNameCache::eraseUnrefreshed() ...@@ -554,7 +554,7 @@ void LLAvatarNameCache::eraseUnrefreshed()
{ {
sLastExpireCheck = now; sLastExpireCheck = now;
for (cache_t::iterator it = sCache.begin(); it != sCache.end(); ++it) for (cache_t::iterator it = sCache.begin(); it != sCache.end();)
{ {
const LLAvatarName& av_name = it->second; const LLAvatarName& av_name = it->second;
if (av_name.mExpires < max_unrefreshed) if (av_name.mExpires < max_unrefreshed)
...@@ -564,7 +564,7 @@ void LLAvatarNameCache::eraseUnrefreshed() ...@@ -564,7 +564,7 @@ void LLAvatarNameCache::eraseUnrefreshed()
<< " user '" << av_name.mUsername << "' " << " user '" << av_name.mUsername << "' "
<< "expired " << now - av_name.mExpires << " secs ago" << "expired " << now - av_name.mExpires << " secs ago"
<< LL_ENDL; << LL_ENDL;
sCache.erase(it); sCache.erase(it++);
} }
} }
LL_INFOS("AvNameCache") << sCache.size() << " cached avatar names" << LL_ENDL; LL_INFOS("AvNameCache") << sCache.size() << " cached avatar names" << LL_ENDL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment