blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

BGE: fix use after free

This commit is contained in:
Campbell Barton 2015-06-15 20:56:44 +10:00
parent fd629d2fb8
commit edfe2d6691
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/gameengine/Ketsji/KX_Scene.cpp
View File

@ -1080,6 +1080,16 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
group->RemoveInstanceObject(newobj);
newobj->RemoveMeshes();
switch (newobj->GetGameObjectType()) {
case SCA_IObject::OBJ_CAMERA:
m_cameras.remove((KX_Camera *)newobj);
break;
case SCA_IObject::OBJ_TEXT:
m_fonts.remove((KX_FontObject *)newobj);
break;
}
ret = 1;
if (newobj->GetGameObjectType()==SCA_IObject::OBJ_LIGHT && m_lightlist->RemoveValue(newobj))
ret = newobj->Release();
@ -1095,7 +1105,10 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
ret = newobj->Release();
if (m_animatedlist->RemoveValue(newobj))
ret = newobj->Release();
/* Warning 'newobj' maye be freed now, only compare, don't access */
if (newobj == m_active_camera)
{
//no AddRef done on m_active_camera so no Release
@ -1103,12 +1116,6 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
m_active_camera = NULL;
}
// in case this is a camera
m_cameras.remove((KX_Camera*)newobj);
// in case this is a font
m_fonts.remove((KX_FontObject*)newobj);
/* currently does nothing, keep in case we need to Unregister something */
#if 0
if (m_sceneConverter)