ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when deleting a misc_model 

The following sequence of events and conditions will cause a segfault to
occur:

1. Delete a misc_model
2. Undo the delete
3. Delete the same model again
4. Undo the delete

A segfault will occur in CEntityMiscModel::Draw when m_model is
dereferenced as it has been deleted and cleared.

When cloning the misc_model entity, a new CEntityMiscModel is created and
the name is set. However, CEntityMiscModel::BuildCacheRequestString relies
on all epairs to be present before being able to generate the *correct*
request string for the misc_model. Not doing so will cause incorrect
behaviour - in this case, the reference count for the CEntityMiscModel is
decremented one too many times and causes the object to be deleted. The
misc_model object is then used later on after it has been freed.

This commit fixes the problem by copying all epairs, before firing the
OnKeyValueChanged events. This way, all epairs will be available when
BuildCacheRequestString is called.
This commit is contained in:
Alex Lo 2015-07-21 00:08:31 +01:00
parent d9d76af697
commit fcefc8b9de
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/entity/entity.cpp
View File

@ -93,8 +93,21 @@ entity_t *Entity_Clone( entity_t *e ){
n = Entity_Alloc();
n->eclass = e->eclass;
for ( ep = e->epairs ; ep ; ep = ep->next )
SetKeyValue( n, ep->key, ep->value );
for ( ep = e->epairs ; ep ; ep = ep->next ){
if ( !ep->key || !ep->key[0] ) {
Sys_FPrintf( SYS_ERR, "ERROR: Entity_Clone: NULL or zero-length key\n" );
return 0;
}
SetKeyValue( n->epairs, ep->key, ep->value );
}
for ( ep = n->epairs ; ep ; ep = ep->next ){
/*!
\todo TODO broadcast this through a clean messaging API ;-)
*/
Entity_OnKeyValueChanged( n, ep->key, ep->value );
}
// copy some misc stuff as well
VectorCopy( e->origin, n->origin );