v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix validation of string material properties in the aiProcess_ValidateDataStructure process. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@606 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-03-13 17:03:13 +00:00
parent 844d814710
commit 07a5daa799
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ValidateDataStructure.cpp
View File

@ -664,7 +664,7 @@ void ValidateDSProcess::Validate( const aiMaterial* pMaterial)
// check all predefined types
if (aiPTI_String == prop->mType) {
// FIX: strings are now stored in a less expensive way ...
if (prop->mDataLength < sizeof(size_t) + ((const aiString*)prop->mData)->length + 1) {
if (prop->mDataLength < 5 || prop->mDataLength < 4 + *reinterpret_cast<uint32_t*>(prop->mData) + 1) {
ReportError("aiMaterial::mProperties[%i].mDataLength is "
"too small to contain a string (%i, needed: %i)",
i,prop->mDataLength,sizeof(aiString));