Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't call miraging codes while iterating through the range manager's entities map.

Browse Source 
I already had made that mistake when working on the fogging system so I
documented it in the code.

Fixes #2756

This was SVN commit r15692.
This commit is contained in:
Nicolas Auvray 2014-08-29 09:01:08 +00:00
parent c069a6555c
commit 5bfe2a4b65
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/simulation2/components/CCmpRangeManager.cpp
View File

@ -1512,10 +1512,15 @@ public:
void UpdateVisibility(entity_id_t ent)
{
// Warning: Code related to fogging (like posting VisibilityChanged messages)
// shouldn't be invoked while keeping an iterator to an element of m_EntityData.
// Otherwise, by deleting mirage entities and so on,
// that code will change the indexes in the map, leading to segfaults.
EntityMap<EntityData>::iterator itEnts = m_EntityData.find(ent);
if (itEnts == m_EntityData.end())
return;
// So we just remember what visibilities to update and do that later.
std::vector<u8> oldVisibilities;
std::vector<u8> newVisibilities;
@ -1645,6 +1650,13 @@ public:
*/
void SeeExploredEntities(player_id_t p)
{
// Warning: Code related to fogging (like ForceMiraging) shouldn't be
// invoked while iterating through m_EntityData.
// Otherwise, by deleting mirage entities and so on, that code will
// change the indexes in the map, leading to segfaults.
// So we just remember what entities to mirage and do that later.
std::vector<entity_id_t> miragableEntities;
for (EntityMap<EntityData>::iterator it = m_EntityData.begin(); it != m_EntityData.end(); ++it)
{
CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), it->first);
@ -1661,7 +1673,14 @@ public:
CmpPtr<ICmpFogging> cmpFogging(GetSimContext(), it->first);
if (cmpFogging)
cmpFogging->ForceMiraging(p);
miragableEntities.push_back(it->first);
}
for (std::vector<entity_id_t>::iterator it = miragableEntities.begin(); it != miragableEntities.end(); ++it)
{
CmpPtr<ICmpFogging> cmpFogging(GetSimContext(), *it);
ENSURE(cmpFogging && "Impossible to retrieve Fogging component, previously achieved");
cmpFogging->ForceMiraging(p);
}
}