summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-03-03 17:13:14 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-03-03 17:13:14 -0800
commit3614dc007328111462297e9244f370fb5f4a0910 (patch)
treef97521fd253bba0acdd2b8b91c8b6c88185e9cac /indra/newview
parent2b5ea03a40c7bdd5962dc25c807b4ce5abb49bde (diff)
Potential fix for EXT-5850 (Crash in LLPluginClassMedia::idle)
We don't actually have a repro for this bug, just a number of crash reports. This potential fix makes an iterator loop safer in the face of the iterator changing during the loop. See the jira for further details. Reviewed by Richard at http://codereview.lindenlab.com/331008
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 344c4c469b..59b4ae6aa6 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -700,9 +700,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
impl_list::iterator iter = sViewerMediaImplList.begin();
impl_list::iterator end = sViewerMediaImplList.end();
- for(; iter != end; iter++)
+ for(; iter != end;)
{
- LLViewerMediaImpl* pimpl = *iter;
+ LLViewerMediaImpl* pimpl = *iter++;
pimpl->update();
pimpl->calculateInterest();
}