livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-10422 Validate loaded mesh

meow-7.2.2
andreykproductengine 2019-02-22 21:02:51 +02:00
parent 86d28366b1
commit ba8f261fdf
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llmeshrepository.cpp
View File

@ -1823,7 +1823,17 @@ bool LLMeshRepoThread::headerReceived(const LLVolumeParams& mesh_params, U8* dat
return false;
}
header_size += stream.tellg();
if (!header.isMap() || !header.has("version"))
{
LL_WARNS(LOG_MESH) << "Mesh header is invalid for ID: " << mesh_id << LL_ENDL;
return false;
}
// make sure there is at least one lod, function returns -1 and marks as 404 otherwise
if (LLMeshRepository::getActualMeshLOD(header, 0) >= 0)
{
header_size += stream.tellg();
}
}
else
{
@ -2908,9 +2918,14 @@ S32 LLMeshRepository::getActualMeshLOD(LLSD& header, S32 lod)
{
lod = llclamp(lod, 0, 3);
if (header.has("404"))
{
return -1;
}
S32 version = header["version"];
if (header.has("404") || version > MAX_MESH_VERSION)
if (version > MAX_MESH_VERSION)
{
return -1;
}