SNOW-488: Malformed animation crash.

Patch by Robin Cornelius.

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3ab4911..c195870 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2010-02-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * SNOW-488: Malformed animation crash.
+          Patch by Robin Cornelius.
+
+          modified:   linden/indra/newview/llvoavatar.cpp
+
+
 2010-02-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Ported some asset storage changes from Snowglobe.
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d2f4a58..883d32f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5306,7 +5306,7 @@ LLVector3 LLVOAvatar::getVolumePos(S32 joint_index, LLVector3& volume_offset)
 //-----------------------------------------------------------------------------
 LLJoint* LLVOAvatar::findCollisionVolume(U32 volume_id)
 {
-        if ((S32)volume_id > mNumCollisionVolumes)
+        if ((S32)volume_id > mNumCollisionVolumes || (S32)volume_id < 0)
         {
                 return NULL;
         }