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

ibar - protect against getting invalid icon ptr on obj deletion 

remove the "ibar_icon" data completely on deletion of an object
pointing to it so if it is accessed later during deletion it'll
return NULL safely.
This commit is contained in:
Carsten Haitzler 2016-12-23 11:16:58 +09:00
parent 8efbeb7acf
commit 74989a9531
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/ibar/e_mod_main.c
View File

@ -1095,6 +1095,7 @@ _ibar_cb_icon_menu_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, v
Evas_Event_Mouse_Up *ev = event_info;
ic = evas_object_data_get(obj, "ibar_icon");
if (!ic) return;
if (ev->button == 3)
{
e_int_client_menu_show(ec, ev->canvas.x, ev->canvas.y, 0, ev->timestamp);
@ -1236,7 +1237,9 @@ _ibar_cb_icon_menu_img_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, vo
ic = evas_object_data_del(obj, "ibar_icon");
if (!ic) return; //menu is closing
evas_object_data_del(obj, "ibar_icon");
ic->client_objs = eina_list_remove(ic->client_objs, obj);
if (!ic->menu) return; //who knows
edje_object_part_box_remove(ic->menu->o_bg, "e.box", data);
ec = evas_object_data_get(obj, "E_Client");
@ -1281,7 +1284,11 @@ _ibar_cb_icon_frame_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void
{
IBar_Icon *ic = evas_object_data_del(obj, "ibar_icon");
if (ic) ic->client_objs = eina_list_remove(ic->client_objs, obj);
if (ic)
{
evas_object_data_del(obj, "ibar_icon");
ic->client_objs = eina_list_remove(ic->client_objs, obj);
}
e_comp_object_signal_callback_del_full(data, "e,state,*focused", "e", _ibar_cb_icon_menu_focus_change, obj);
evas_object_smart_callback_del_full(data, "desk_change", _ibar_cb_icon_menu_desk_change, obj);
}