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

Eo: Check parent is valid in eo_parent_set. 

This is an extension to raster's 0355a6a296
(eo - fix _parent_set in base clase when old_parent_pd is NULL).
I also added an error message in case this check fails.
This commit is contained in:
Tom Hacohen 2013-11-20 11:53:45 +00:00
parent 0355a6a296
commit cad3cf30a4
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,22 +131,34 @@ _parent_set(Eo *obj, void *class_data, va_list *list)
Private_Data *old_parent_pd;
old_parent_pd = eo_data_scope_get(pd->parent, EO_BASE_CLASS);
if (old_parent_pd)
old_parent_pd->children = eina_list_remove(old_parent_pd->children,
obj);
old_parent_pd->children = eina_list_remove(old_parent_pd->children,
obj);
eo_xunref(obj, pd->parent);
}
pd->parent = parent_id;
if (pd->parent)
/* Set new parent */
if (parent_id)
{
Private_Data *parent_pd = NULL;
parent_pd = eo_data_scope_get(parent_id, EO_BASE_CLASS);
if (parent_pd)
parent_pd->children = eina_list_append(parent_pd->children,
obj);
eo_xref(obj, pd->parent);
if (EINA_LIKELY(parent_pd != NULL))
{
pd->parent = parent_id;
parent_pd->children = eina_list_append(parent_pd->children,
obj);
eo_xref(obj, pd->parent);
}
else
{
pd->parent = NULL;
ERR("New parent %p for object %p is not a valid Eo object.",
parent_id, obj);
}
}
else
{
pd->parent = NULL;
}
}