From efb72e66d0e091121e9e616125b3162fb69e97b5 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 12 Jul 2010 17:54:02 +0100
Subject: [PATCH] SNOW-484/DEV-51808 FIXED Recursive animations can crash
viewer
---
doc/contributions.txt | 1 +
indra/llcharacter/llkeyframemotion.cpp | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8c6bd5e0fea..c8125c675fb 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -517,6 +517,7 @@ Ringo Tuxing
Robin Cornelius
SNOW-108
SNOW-204
+ SNOW-484
VWR-2488
VWR-9557
VWR-11128
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index f4dc3b927ba..7bc9e97eb16 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1248,6 +1248,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
return FALSE;
}
+ if(mJointMotionList->mEmoteName==mID.asString())
+ {
+ llwarns << "Malformed animation mEmoteName==mID" << llendl;
+ return FALSE;
+ }
+
//-------------------------------------------------------------------------
// get loop
//-------------------------------------------------------------------------
--
GitLab