From fef05cf2cad3c6780f06b9aa80e2c2c013f1253f Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 21 Oct 2020 11:27:36 -0500 Subject: [PATCH] fix #365 --- Engine/source/ts/tsShapeOldRead.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Engine/source/ts/tsShapeOldRead.cpp b/Engine/source/ts/tsShapeOldRead.cpp index 9b06aff75..104e40840 100644 --- a/Engine/source/ts/tsShapeOldRead.cpp +++ b/Engine/source/ts/tsShapeOldRead.cpp @@ -856,12 +856,12 @@ void TSShape::writeName(Stream * s, S32 nameIndex) S32 TSShape::readName(Stream * s, bool addName) { static char buffer[256]; - S32 sz; + U32 sz; S32 nameIndex = -1; s->read(&sz); - if (sz) + if (sz>0 && sz<255) { - s->read(sz*sizeof(char),buffer); + s->read(sz,buffer); buffer[sz] = '\0'; nameIndex = findName(buffer); @@ -881,6 +881,8 @@ S32 TSShape::readName(Stream * s, bool addName) names.last() = buffer; } } + else + Con::errorf("invalid TSShape::readName length!"); return nameIndex; }