enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm_toolbar: fix memory leak in _elm_toolbar_nearest_visible_item_get 

@fix

Reviewers: cedric, seoz, Hermet, raster

Subscribers: reutskiy.v.v

Differential Revision: https://phab.enlightenment.org/D1822
This commit is contained in:
Andrii Kroitor 2014-12-26 11:26:42 +09:00 committed by ChunEon Park
parent cf25180e0c
commit c55e8ccac4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -690,7 +690,10 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, ix, iy, iw, ih))
{
if (!elm_object_item_disabled_get(eo_it))
return eo_it;
{
eina_list_free(item_list);
return eo_it;
}
else
search_next = EINA_TRUE;
}
@ -709,7 +712,10 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
evas_object_geometry_get(VIEW(item), &cx, &cy, &cw, &ch);
if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch) &&
!elm_object_item_disabled_get(EO_OBJ(item)))
return EO_OBJ(item);
{
eina_list_free(item_list);
return EO_OBJ(item);
}
}
}
else
@ -724,9 +730,13 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
evas_object_geometry_get(VIEW(item), &cx, &cy, &cw, &ch);
if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch) &&
!elm_object_item_disabled_get(EO_OBJ(item)))
return EO_OBJ(item);
{
eina_list_free(item_list);
return EO_OBJ(item);
}
}
}
eina_list_free(item_list);
return eo_it;
}