Second Life viewer sources 1.15.1.3

4 files changed, 70 insertions, 67 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 94e45b6..e5d610a 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1409,6 +1409,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!success)
                         {
                                 llwarns << "can't read rotation key (" << k << ")" << llendl;
+                                delete rot_key;
                                 return FALSE;
                         }
 
@@ -1527,6 +1528,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackU8(byte, "chain_length"))
                         {
                                 llwarns << "can't read constraint chain length" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
                         constraintp->mChainLength = (S32) byte;
@@ -1534,6 +1536,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackU8(byte, "constraint_type"))
                         {
                                 llwarns << "can't read constraint type" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
                         constraintp->mConstraintType = (EConstraintType)byte;
@@ -1543,6 +1546,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackBinaryDataFixed(bin_data, BIN_DATA_LENGTH, "source_volume"))
                         {
                                 llwarns << "can't read source volume name" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
@@ -1553,12 +1557,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackVector3(constraintp->mSourceConstraintOffset, "source_offset"))
                         {
                                 llwarns << "can't read constraint source offset" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
                         if (!dp.unpackBinaryDataFixed(bin_data, BIN_DATA_LENGTH, "target_volume"))
                         {
                                 llwarns << "can't read target volume name" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
@@ -1578,12 +1584,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackVector3(constraintp->mTargetConstraintOffset, "target_offset"))
                         {
                                 llwarns << "can't read constraint target offset" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
                         if (!dp.unpackVector3(constraintp->mTargetConstraintDir, "target_dir"))
                         {
                                 llwarns << "can't read constraint target direction" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
@@ -1596,24 +1604,28 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         if (!dp.unpackF32(constraintp->mEaseInStartTime, "ease_in_start"))
                         {
                                 llwarns << "can't read constraint ease in start time" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
                         if (!dp.unpackF32(constraintp->mEaseInStopTime, "ease_in_stop"))
                         {
                                 llwarns << "can't read constraint ease in stop time" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
                         if (!dp.unpackF32(constraintp->mEaseOutStartTime, "ease_out_start"))
                         {
                                 llwarns << "can't read constraint ease out start time" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
                         if (!dp.unpackF32(constraintp->mEaseOutStopTime, "ease_out_stop"))
                         {
                                 llwarns << "can't read constraint ease out stop time" << llendl;
+                                delete constraintp;
                                 return FALSE;
                         }
 
@@ -1739,29 +1751,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                 success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset");
                 if (shared_constraintp->mConstraintTargetType == TYPE_GROUND)
                 {
-                        success &= dp.packU8(shared_constraintp->mChainLength, "chain_length");
-                        success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type");
-                        char volume_name[16];   /* Flawfinder: ignore */
-                        snprintf(volume_name, sizeof(volume_name), "%s",        /* Flawfinder: ignore */
-                                mCharacter->findCollisionVolume(shared_constraintp->mSourceConstraintVolume)->getName().c_str()); 
-                        success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "source_volume");
-                        success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset");
-                        if (shared_constraintp->mConstraintTargetType == TYPE_GROUND)
-                        {
-                                snprintf(volume_name,sizeof(volume_name), "%s", "GROUND");      /* Flawfinder: ignore */
-                        }
-                        else
-                        {
-                                snprintf(volume_name, sizeof(volume_name),"%s",         /* Flawfinder: ignore */
-                                        mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str());       
-                        }
-                        success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "target_volume");
-                        success &= dp.packVector3(shared_constraintp->mTargetConstraintOffset, "target_offset");
-                        success &= dp.packVector3(shared_constraintp->mTargetConstraintDir, "target_dir");
-                        success &= dp.packF32(shared_constraintp->mEaseInStartTime, "ease_in_start");
-                        success &= dp.packF32(shared_constraintp->mEaseInStopTime, "ease_in_stop");
-                        success &= dp.packF32(shared_constraintp->mEaseOutStartTime, "ease_out_start");
-                        success &= dp.packF32(shared_constraintp->mEaseOutStopTime, "ease_out_stop");
+                        snprintf(volume_name,sizeof(volume_name), "%s", "GROUND");      /* Flawfinder: ignore */
                 }
                 else
                 {
@@ -1967,39 +1957,46 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
         // create an instance of this motion (it may or may not already exist)
         LLKeyframeMotion* motionp = (LLKeyframeMotion*) character->createMotion(asset_uuid);
 
-        if (0 == status && motionp)
+        if (motionp)
         {
-                if (motionp->mAssetStatus == ASSET_LOADED)
-                {
-                        // asset already loaded
-                        return;
-                }
-                LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-                S32 size = file.getSize();
-
-                U8* buffer = new U8[size];
-                file.read((U8*)buffer, size);   /*Flawfinder: ignore*/
-
-                lldebugs << "Loading keyframe data for: " << motionp->getName() << ":" << motionp->getID() << " (" << size << " bytes)" << llendl;
-
-                LLDataPackerBinaryBuffer dp(buffer, size);
-                if (motionp->deserialize(dp))
+                if (0 == status)
                 {
-                        motionp->mAssetStatus = ASSET_LOADED;
+                        if (motionp->mAssetStatus == ASSET_LOADED)
+                        {
+                                // asset already loaded
+                                return;
+                        }
+                        LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+                        S32 size = file.getSize();
+                        
+                        U8* buffer = new U8[size];
+                        file.read((U8*)buffer, size);   /*Flawfinder: ignore*/
+                        
+                        lldebugs << "Loading keyframe data for: " << motionp->getName() << ":" << motionp->getID() << " (" << size << " bytes)" << llendl;
+                        
+                        LLDataPackerBinaryBuffer dp(buffer, size);
+                        if (motionp->deserialize(dp))
+                        {
+                                motionp->mAssetStatus = ASSET_LOADED;
+                        }
+                        else
+                        {
+                                llwarns << "Failed to decode asset for animation " << motionp->getName() << ":" << motionp->getID() << llendl;
+                                motionp->mAssetStatus = ASSET_FETCH_FAILED;
+                        }
+                        
+                        delete []buffer;
                 }
                 else
                 {
-                        llwarns << "Failed to decode asset for animation " << motionp->getName() << ":" << motionp->getID() << llendl;
+                        llwarns << "Failed to load asset for animation " << motionp->getName() << ":" << motionp->getID() << llendl;
                         motionp->mAssetStatus = ASSET_FETCH_FAILED;
                 }
-
-                delete []buffer;
-
         }
         else
         {
-                llwarns << "Failed to load asset for animation " << motionp->getName() << ":" << motionp->getID() << llendl;
-                motionp->mAssetStatus = ASSET_FETCH_FAILED;
+                // motionp is NULL
+                llwarns << "Failed to createMotion() for asset UUID " << asset_uuid << llendl;
         }
 }
 
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 5970909..d24b8a6 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -187,6 +187,12 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
                 ParameterizedMotion* firstMotion = NULL;
                 ParameterizedMotion* secondMotion = NULL;
 
+                if (NULL == paramValue) // unexpected, but...
+                {
+                        llwarns << "paramValue == NULL" << llendl;
+                        continue;
+                }
+
                 for (ParameterizedMotion* paramMotion = motionList->getFirstData(); paramMotion; paramMotion = motionList->getNextData())
                 {
                         paramMotion->first->onUpdate(time, joint_mask);
diff --git a/linden/indra/llcharacter/llstatemachine.cpp b/linden/indra/llcharacter/llstatemachine.cpp
index 1ad81be..d7ecae4 100644
--- a/linden/indra/llcharacter/llstatemachine.cpp
+++ b/linden/indra/llcharacter/llstatemachine.cpp
@@ -362,28 +362,28 @@ void LLStateMachine::processTransition(LLFSMTransition& transition, void* user_d
 {
         llassert(mStateDiagram);
         
+        if (NULL == mCurrentState)
+        {
+                llwarns << "mCurrentState == NULL; aborting processTransition()" << llendl;
+                return;
+        }
+
         LLFSMState* new_state = mStateDiagram->processTransition(*mCurrentState, transition);
 
+        if (NULL == new_state)
+        {
+                llwarns << "new_state == NULL; aborting processTransition()" << llendl;
+                return;
+        }
+
         mLastTransition = &transition;
         mLastState = mCurrentState;
 
         if (*mCurrentState != *new_state)
         {
-                if (mCurrentState && new_state && *mCurrentState != *new_state)
-                {
-                        mCurrentState->onExit(user_data);
-                }
-                if (new_state)
-                {
-                        if (!mCurrentState || *mCurrentState != *new_state)
-                        {
-                                mCurrentState = new_state;
-                                if (mCurrentState)
-                                {
-                                        mCurrentState->onEntry(user_data);
-                                }
-                        }
-                }
+                mCurrentState->onExit(user_data);
+                mCurrentState = new_state;
+                mCurrentState->onEntry(user_data);
 #if FSM_PRINT_STATE_TRANSITIONS
                 llinfos << "Entering state " << mCurrentState->getName() <<
                         " on transition " << transition.getName() << " from state " << 
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index de163eb..d1c08f9 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -232,16 +232,16 @@ void LLVisualParam::setWeight(F32 weight, BOOL set_by_user)
 //-----------------------------------------------------------------------------
 void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user)
 {
-        if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+        if (mInfo)
         {
-                if (mInfo)
+                if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
                 {
                         mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight);
                 }
-                else
-                {
-                        mTargetWeight = target_value;
-                }
+        }
+        else
+        {
+                mTargetWeight = target_value;
         }
         mIsAnimating = TRUE;