summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 17:35:34 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 17:35:34 +0000
commit143de8db4e02d1341afc3d1fb590d2c4483d585d (patch)
treef1aefdbfc44142d83f63340f177a5d384f7af744 /indra
parent612df63956a0758548d5291af72fb3ef9b06282a (diff)
CID-96
Checker: FORWARD_NULL Function: LLDriverParam::getNextDistortion(unsigned int *, LLPolyMesh **) File: /indra/newview/lldriverparam.cpp
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldriverparam.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp
index 8ebfa471f3..830e975e8a 100644
--- a/indra/newview/lldriverparam.cpp
+++ b/indra/newview/lldriverparam.cpp
@@ -432,6 +432,12 @@ const LLVector3* LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_
}
}
+ llassert(driven);
+ if (!driven)
+ {
+ return NULL; // shouldn't happen, but...
+ }
+
// We're already in the middle of a param's distortions, so get the next one.
const LLVector3* v = driven->mParam->getNextDistortion( index, poly_mesh );
if( (!v) && (iter != mDriven.end()) )