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

make evas smart callbnacks safer if something bad happens in memory.

This commit is contained in:
Carsten Haitzler 2013-03-11 15:55:04 +09:00
parent dee5e1d85f
commit b389f6dc9a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,6 +752,7 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar
if (!event) return NULL; if (!event) return NULL;
EINA_LIST_FOREACH(o->callbacks, l, cb) EINA_LIST_FOREACH(o->callbacks, l, cb)
{ {
if (!cb) continue;
if ((!strcmp(cb->event, event)) && (cb->func == func)) if ((!strcmp(cb->event, event)) && (cb->func == func))
{ {
void *data; void *data;
@ -780,6 +781,7 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas
if (!event) return NULL; if (!event) return NULL;
EINA_LIST_FOREACH(o->callbacks, l, cb) EINA_LIST_FOREACH(o->callbacks, l, cb)
{ {
if (!cb) continue;
if ((!strcmp(cb->event, event)) && (cb->func == func) && (cb->func_data == data)) if ((!strcmp(cb->event, event)) && (cb->func == func) && (cb->func_data == data))
{ {
void *ret; void *ret;
@ -814,6 +816,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
strshare = eina_stringshare_add(event); strshare = eina_stringshare_add(event);
EINA_LIST_FOREACH(o->callbacks, l, cb) EINA_LIST_FOREACH(o->callbacks, l, cb)
{ {
if (!cb) continue;
if (!cb->delete_me) if (!cb->delete_me)
{ {
if (cb->event == strshare) if (cb->event == strshare)
@ -1139,6 +1142,7 @@ evas_object_smart_callbacks_clear(Evas_Object *eo_obj)
{ {
cb = eina_list_data_get(l); cb = eina_list_data_get(l);
l = eina_list_next(l); l = eina_list_next(l);
if (!cb) continue;
if (cb->delete_me) if (cb->delete_me)
{ {
o->callbacks = eina_list_remove(o->callbacks, cb); o->callbacks = eina_list_remove(o->callbacks, cb);
@ -1206,6 +1210,7 @@ evas_object_smart_cleanup(Evas_Object *eo_obj)
{ {
Evas_Smart_Callback *cb = o->callbacks->data; Evas_Smart_Callback *cb = o->callbacks->data;
o->callbacks = eina_list_remove(o->callbacks, cb); o->callbacks = eina_list_remove(o->callbacks, cb);
if (!cb) continue;
if (cb->event) eina_stringshare_del(cb->event); if (cb->event) eina_stringshare_del(cb->event);
EVAS_MEMPOOL_FREE(_mp_cb, cb); EVAS_MEMPOOL_FREE(_mp_cb, cb);
} }