rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eo/base_class: explicitly refuse to set an object as its own parent 

somehow this has been possible until now. no.

@fix

Differential Revision: https://phab.enlightenment.org/D6489
This commit is contained in:
Mike Blumenkrantz 2018-06-29 17:10:26 -04:00
parent 7a8ff655c8
commit cba95178d5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/eo/eo_base_class.c
View File

@ -715,7 +715,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
if (parent_id != NULL)
{
EO_OBJ_POINTER_GOTO(parent_id, parent_obj, err_impossible);
bad_parent = parent_obj->invalidate;
bad_parent = parent_obj->invalidate || (obj == parent_id);
EO_OBJ_DONE(parent_id);
}
@ -786,8 +786,12 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
err_parent_done:
EO_OBJ_DONE(obj);
err_parent:
ERR("New parent %p for object %p is not a valid Eo object.",
parent_id, obj);
if (obj == parent_id)
ERR("New parent %p for object %p will not be set: THIS IS THE SAME OBJECT.",
parent_id, obj);
else
ERR("New parent %p for object %p is not a valid Eo object.",
parent_id, obj);
return;
err_impossible: