Merged in jacek/next

3 files changed, 40 insertions, 8 deletions

diff --git a/linden/indra/lib/python/indra/base/lluuid.py b/linden/indra/lib/python/indra/base/lluuid.py
index aceea29..40ce818 100644
--- a/linden/indra/lib/python/indra/base/lluuid.py
+++ b/linden/indra/lib/python/indra/base/lluuid.py
@@ -26,7 +26,8 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-import md5, random, socket, string, time, re
+import random, socket, string, time, re
+from hashlib import md5
 import uuid
 
 def _int2binstr(i,l):
@@ -196,7 +197,7 @@ class UUID(object):
         from c++ implementation for portability reasons.
         Returns self.
         """
-        m = md5.new()
+        m = md5()
         m.update(uuid.uuid1().bytes)
         self._bits = m.digest()
         return self
diff --git a/linden/indra/lib/python/indra/ipc/llmessage.py b/linden/indra/lib/python/indra/ipc/llmessage.py
index 6161bad..91fb36b 100644
--- a/linden/indra/lib/python/indra/ipc/llmessage.py
+++ b/linden/indra/lib/python/indra/ipc/llmessage.py
@@ -26,8 +26,6 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-from sets import Set, ImmutableSet
-
 from compatibility import Incompatible, Older, Newer, Same
 from tokenstream import TokenStream
 
@@ -44,8 +42,8 @@ class Template:
     
     def compatibleWithBase(self, base):
         messagenames = (
-              ImmutableSet(self.messages.keys())
-            | ImmutableSet(base.messages.keys())
+              frozenset(self.messages.keys())
+            | frozenset(base.messages.keys())
             )
             
         compatibility = Same()
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 212020b..4b138b1 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1560,6 +1560,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                         }
                         constraintp->mChainLength = (S32) byte;
 
+                        if((U32)constraintp->mChainLength > mJointMotionList->getNumJointMotions())
+                        {
+                                llwarns << "invalid constraint chain length" << llendl;
+                                delete constraintp;
+                                return FALSE;
+                        }
+
                         if (!dp.unpackU8(byte, "constraint_type"))
                         {
                                 llwarns << "can't read constraint type" << llendl;
@@ -1587,7 +1594,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                                 delete constraintp;
                                 return FALSE;
                         }
-
+                        
+                        if( !(constraintp->mSourceConstraintOffset.isFinite()) )
+                        {
+                                llwarns << "non-finite 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;
@@ -1615,6 +1629,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                                 return FALSE;
                         }
 
+                        if( !(constraintp->mTargetConstraintOffset.isFinite()) )
+                        {
+                                llwarns << "non-finite constraint target offset" << llendl;
+                                delete constraintp;
+                                return FALSE;
+                        }
+                        
                         if (!dp.unpackVector3(constraintp->mTargetConstraintDir, "target_dir"))
                         {
                                 llwarns << "can't read constraint target direction" << llendl;
@@ -1622,6 +1643,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                                 return FALSE;
                         }
 
+                        if( !(constraintp->mTargetConstraintDir.isFinite()) )
+                        {
+                                llwarns << "non-finite constraint target direction" << llendl;
+                                delete constraintp;
+                                return FALSE;
+                        }
+
                         if (!constraintp->mTargetConstraintDir.isExactlyZero())
                         {
                                 constraintp->mUseTargetOffset = TRUE;
@@ -1685,8 +1713,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                                                 break;
                                         }
                                 }
+                                if (constraintp->mJointStateIndices[i] < 0 )
+                                {
+                                        llwarns << "No joint index for constraint " << i << llendl;
+                                        delete constraintp;
+                                        return FALSE;
+                                }
                         }
-
                 }
         }