From d1d09d7c18c202026e69052c99c06af3827e9012 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 5 Mar 2013 03:51:45 +0100 Subject: [PATCH] Bail out instead of crash when parseTEMessage fails. --- indra/newview/llvoavatar.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index fee8c5253..8a949e275 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7419,7 +7419,11 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) ESex old_sex = getSex(); LLTEContents tec; - parseTEMessage(mesgsys, _PREHASH_ObjectData, -1, tec); + if (!parseTEMessage(mesgsys, _PREHASH_ObjectData, -1, tec)) + { + llwarns << avString() << "Failed to parse ObjectData" << llendl; + return; + } U8 appearance_version = 0; S32 this_update_cof_version = LLViewerInventoryCategory::VERSION_UNKNOWN;