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

Avoid memory corruption by cleaning up parts at the correct time. 

SVN revision: 7942
This commit is contained in:
rbdpngn 2003-11-25 07:22:19 +00:00 committed by rbdpngn
parent 6dd589c4c4
commit 6bee6d788d
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/edje/src/lib/edje_load.c
View File

@ -432,7 +432,7 @@ _edje_file_del(Edje *ed)
if (ed->collection->references <= 0)
{
ed->file->collection_hash = evas_hash_del(ed->file->collection_hash, ed->part, ed->collection);
_edje_collection_free(ed->collection);
_edje_collection_free(ed, ed->collection);
}
ed->collection = NULL;
}
@ -446,7 +446,7 @@ _edje_file_del(Edje *ed)
while (ed->parts)
{
Edje_Real_Part *rp;
rp = ed->parts->data;
ed->parts = evas_list_remove(ed->parts, rp);
evas_object_event_callback_del(rp->object,
@ -467,8 +467,7 @@ _edje_file_del(Edje *ed)
evas_object_event_callback_del(rp->object,
EVAS_CALLBACK_MOUSE_WHEEL,
_edje_mouse_wheel_cb);
_edje_text_part_on_del(ed, rp);
_edje_color_class_on_del(ed, rp);
_edje_text_real_part_on_del(ed, rp);
evas_object_del(rp->object);
if (rp->swallowed_object)
{
@ -554,12 +553,12 @@ _edje_file_free(Edje_File *edf)
}
void
_edje_collection_free(Edje_Part_Collection *ec)
_edje_collection_free(Edje *ed, Edje_Part_Collection *ec)
{
while (ec->programs)
{
Edje_Program *pr;
pr = ec->programs->data;
ec->programs = evas_list_remove(ec->programs, pr);
if (pr->name) free(pr->name);
@ -580,11 +579,17 @@ _edje_collection_free(Edje_Part_Collection *ec)
while (ec->parts)
{
Edje_Part *ep;
ep = ec->parts->data;
ec->parts = evas_list_remove(ec->parts, ep);
_edje_text_part_on_del(ed, ep);
_edje_color_class_on_del(ed, ep);
if (ep->name) free(ep->name);
if (ep->default_desc) _edje_collection_free_part_description_free(ep->default_desc);
if (ep->default_desc)
{
_edje_collection_free_part_description_free(ep->default_desc);
ep->default_desc = NULL;
}
while (ep->other_desc)
{
Edje_Part_Description *desc;

7
legacy/edje/src/lib/edje_private.h
View File

@ -565,7 +565,7 @@ void _edje_edd_setup(void);
void _edje_file_add(Edje *ed);
void _edje_file_del(Edje *ed);
void _edje_file_free(Edje_File *edf);
void _edje_collection_free(Edje_Part_Collection *ec);
void _edje_collection_free(Edje *ed, Edje_Part_Collection *ec);
Edje *_edje_add(Evas_Object *obj);
void _edje_del(Edje *ed);
@ -581,14 +581,15 @@ void _edje_emit(Edje *ed, char *sig, char *src);
void _edje_text_init(void);
void _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep);
void _edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep);
void _edje_text_part_on_del(Edje *ed, Edje_Real_Part *ep);
void _edje_text_part_on_del(Edje *ed, Edje_Part *ep);
void _edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep);
void _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *params, Edje_Part_Description *chosen_desc);
Edje_Real_Part *_edje_real_part_get(Edje *ed, char *part);
Edje_Color_Class *_edje_color_class_find(Edje *ed, char *color_class);
void _edje_color_class_member_add(Edje *ed, char *color_class);
void _edje_color_class_member_del(Edje *ed, char *color_class);
void _edje_color_class_on_del(Edje *ed, Edje_Real_Part *rp);
void _edje_color_class_on_del(Edje *ed, Edje_Part *ep);
Edje_Text_Class *_edje_text_class_find(Edje *ed, char *text_class);
void _edje_text_class_member_add(Edje *ed, char *text_class);
void _edje_text_class_member_del(Edje *ed, char *text_class);

36
legacy/edje/src/lib/edje_text.c
View File

@ -229,10 +229,33 @@ _edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep)
}
void
_edje_text_part_on_del(Edje *ed, Edje_Real_Part *ep)
_edje_text_part_on_del(Edje *ed, Edje_Part *pt)
{
Evas_List *tmp;
if ((pt->default_desc) && (pt->default_desc->text.text_class))
{
_edje_text_class_member_del(ed, pt->default_desc->text.text_class);
pt->default_desc->text.text_class = NULL;
}
for (tmp = pt->other_desc; tmp; tmp = tmp->next)
{
Edje_Part_Description *desc;
desc = tmp->data;
if (desc->text.text_class)
{
_edje_text_class_member_del(ed, desc->text.text_class);
desc->text.text_class = NULL;
}
}
return;
}
void
_edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep)
{
Evas_List *tmp;
Edje_Part *pt = ep->part;
while (ep->extra_objects)
{
@ -242,15 +265,6 @@ _edje_text_part_on_del(Edje *ed, Edje_Real_Part *ep)
ep->extra_objects = evas_list_remove(ep->extra_objects, o);
evas_object_del(o);
}
if ((pt->default_desc) && (pt->default_desc->text.text_class)) _edje_text_class_member_del(ed, pt->default_desc->text.text_class);
for (tmp = pt->other_desc; tmp; tmp = tmp->next)
{
Edje_Part_Description *desc;
desc = tmp->data;
if (desc->text.text_class) _edje_text_class_member_del(ed, desc->text.text_class);
}
return;
}

9
legacy/edje/src/lib/edje_util.c
View File

@ -1054,10 +1054,9 @@ _edje_color_class_member_del(Edje *ed, char *color_class)
}
void
_edje_color_class_on_del(Edje *ed, Edje_Real_Part *rp)
_edje_color_class_on_del(Edje *ed, Edje_Part *ep)
{
Evas_List *tmp;
Edje_Part *ep = rp->part;
if ((ep->default_desc) && (ep->default_desc->color_class)) _edje_color_class_member_del(ed, ep->default_desc->color_class);
for (tmp = ep->other_desc; tmp; tmp = tmp->next)
@ -1065,7 +1064,11 @@ _edje_color_class_on_del(Edje *ed, Edje_Real_Part *rp)
Edje_Part_Description *desc;
desc = tmp->data;
if (desc->color_class) _edje_color_class_member_del(ed, desc->color_class);
if (desc->color_class)
{
_edje_color_class_member_del(ed, desc->color_class);
desc->color_class = NULL;
}
}
}