summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-11-22 17:26:39 +0200
committerAndrew Productengine <adyukov@productengine.com>2010-11-22 17:26:39 +0200
commit44a6e5da2c76b16bb70a93ba9952bc338dce2e89 (patch)
tree608759a3c6de7094f073a271e60c323b2d0d1a9e /indra/llaudio
parent02701073ce70fc2e2043adf0ed7e0d6879669215 (diff)
STORM-521 FIXED Made defensive fix for crash in LLAudioSource::hasPendingPreloads().
Couldn't reproduce the crash, but made defensive fix. Added check for NULL into for loop that iterates through mPreloadMap in LLAudioSource::hasPendingPreloads(). Such check is already present in similar situation in LLAudioEngine::startNextTransfer().
Diffstat (limited to 'indra/llaudio')
-rw-r--r--indra/llaudio/llaudioengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 1cc03bddb8..c9cb1cd6e7 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -1557,6 +1557,10 @@ bool LLAudioSource::hasPendingPreloads() const
LLAudioData *adp = iter->second;
// note: a bad UUID will forever be !hasDecodedData()
// but also !hasValidData(), hence the check for hasValidData()
+ if (!adp)
+ {
+ continue;
+ }
if (!adp->hasDecodedData() && adp->hasValidData())
{
// This source is still waiting for a preload