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

Fix for a potential crash in LLReflectionMapManager::registerSpatialGroup() 

The spatial partion could potentially be NULL and shall therefore been tested for this case.

Similar fix to 08cf926d3b
master
Henri Beauchamp 2024-01-29 19:42:19 +01:00 committed by Andrey Kleshchev
parent 9d3f040424
commit 2d9e00eff5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llreflectionmapmanager.cpp
View File

@ -463,17 +463,22 @@ void LLReflectionMapManager::getReflectionMaps(std::vector<LLReflectionMap*>& ma
LLReflectionMap* LLReflectionMapManager::registerSpatialGroup(LLSpatialGroup* group)
{
if (group->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_VOLUME)
if (!group)
{
OctreeNode* node = group->getOctreeNode();
F32 size = node->getSize().getF32ptr()[0];
if (size >= 15.f && size <= 17.f)
{
return addProbe(group);
}
return nullptr;
}
return nullptr;
LLSpatialPartition* part = group->getSpatialPartition();
if (!part || part->mPartitionType != LLViewerRegion::PARTITION_VOLUME)
{
return nullptr;
}
OctreeNode* node = group->getOctreeNode();
F32 size = node->getSize().getF32ptr()[0];
if (size < 15.f || size > 17.f)
{
return nullptr;
}
return addProbe(group);
}
LLReflectionMap* LLReflectionMapManager::registerViewerObject(LLViewerObject* vobj)