enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

evas: make smart object deletion more robust to bad child behavior.

This commit is contained in:
Cedric BAIL 2018-05-23 23:12:02 -07:00
parent 40af4fe94b
commit 774ae32108
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/evas/canvas/evas_object_smart.c
View File

@ -323,7 +323,10 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
EAPI void
evas_object_smart_member_del(Evas_Object *eo_obj)
{
Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
Evas_Object_Protected_Data *obj;
if (!eo_obj) return ;
obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if (!obj) return;
if (!obj->smart.parent) return;
Evas_Object *smart_obj = obj->smart.parent;
@ -1477,7 +1480,13 @@ evas_object_smart_cleanup(Evas_Object *eo_obj)
(Evas_Object_Protected_Data *)o->contained;
Evas_Object *contained_obj = contained->object;
if (contained->smart.parent != eo_obj)
if (!contained_obj)
{
ERR("Found an undefined object %p in %s.", contained, efl_debug_name_get(eo_obj));
o->contained = eina_inlist_remove
(o->contained, EINA_INLIST_GET(contained));
}
else if (contained->smart.parent != eo_obj)
{
Evas_Layer *lay = obj->layer;