summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-15 13:44:21 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-15 13:44:21 -0500
commit354ccc1640dd223ccea20908183cc05a00ecaf6f (patch)
treef944527e621f4795ec25c0b46751bae7de6a211b /indra
parent741821eb6a8717896307da44b1b8e7078a865fff (diff)
additional safety check for bad appearance messages
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llprimitive/llprimitive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index faf98883d9..cf6a3f97d2 100755
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1259,7 +1259,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name
mesgsys->getBinaryDataFast(block_name, _PREHASH_TextureEntry, tec.packed_buffer, 0, block_num, LLTEContents::MAX_TE_BUFFER);
}
- tec.face_count = getNumTEs();
+ tec.face_count = llmin((U32)getNumTEs(),LLTEContents::MAX_TES);
U8 *cur_ptr = tec.packed_buffer;
cur_ptr += unpackTEField(cur_ptr, tec.packed_buffer+tec.size, (U8 *)tec.image_data, 16, tec.face_count, MVT_LLUUID);