From 5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 30 Apr 2010 01:17:35 -0700
Subject: Applied patch for SNOW-484 by Robin Cornelius: recursive animations
 can crash viewer

---
 linden/indra/llcharacter/llkeyframemotion.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra')

diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 4cb2227..c1e26a1 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1246,6 +1246,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
 		return FALSE;
 	}
 
+	if(mJointMotionList->mEmoteName==mID.asString())
+	{
+		llwarns << "Malformed animation mEmoteName==mID" << llendl;
+		return FALSE;
+	}
+
 	//-------------------------------------------------------------------------
 	// get loop
 	//-------------------------------------------------------------------------
-- 
cgit v1.1