1 files changed, 21 insertions, 0 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 3b4cf7e..6e80e8d 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1460,6 +1460,10 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
 
                                 LLQuaternion::Order ro = StringToOrder("ZYX");
                                 rot_key.mRotation = mayaQ(rot_angles.mV[VX], rot_angles.mV[VY], rot_angles.mV[VZ], ro);
+                                if(!(rot_key.mRotation.isFinite()))
+                                {
+                                        return FALSE;
+                                }
                         }
                         else
                         {
@@ -1538,6 +1542,10 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (old_version)
                         {
                                 success = dp.unpackVector3(pos_key.mPosition, "pos");
+                                if(!(pos_key.mPosition.isFinite()))
+                                {
+                                        return FALSE;
+                                }
                         }
                         else
                         {
@@ -1644,6 +1652,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         str = (char*)bin_data;
                         constraintp->mSourceConstraintVolume = mCharacter->getCollisionVolumeID(str);
 
+                        if(constraintp->mSourceConstraintVolume == -1)
+                        {
+                                llwarns << "can't find a valid source collision volume." << llendl;
+                                delete constraintp;
+                                return FALSE;
+                        }
+
                         if (!dp.unpackVector3(constraintp->mSourceConstraintOffset, "source_offset"))
                         {
                                 llwarns << "can't read constraint source offset" << llendl;
@@ -1676,6 +1691,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         {
                                 constraintp->mConstraintTargetType = CONSTRAINT_TARGET_TYPE_BODY;
                                 constraintp->mTargetConstraintVolume = mCharacter->getCollisionVolumeID(str);
+                                if(constraintp->mTargetConstraintVolume == -1)
+                                {
+                                        llwarns << "can't find a valid target collision volume." << llendl;
+                                        delete constraintp;
+                                        return FALSE;
+                                }
                         }
 
                         if (!dp.unpackVector3(constraintp->mTargetConstraintOffset, "target_offset"))