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

elm/gengrid: Fix null pointer dereferences. 

CID: 1357210 and 1357209.
This commit is contained in:
Daniel Juyung Seo 2016-07-04 07:29:53 +09:00
parent bc7f223754
commit 3627fa7883
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/elementary/elm_gengrid.c
View File

@ -2075,8 +2075,9 @@ _item_focus_up(Elm_Gengrid_Data *sd)
if (!sd->focused_item)
{
prev = ELM_GEN_ITEM_FROM_INLIST(sd->items->last);
while (((prev) && (prev->generation < sd->generation))
|| elm_object_item_disabled_get(EO_OBJ(prev)))
while (prev &&
(prev->generation < sd->generation ||
elm_object_item_disabled_get(EO_OBJ(prev))))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
}
else
@ -2116,8 +2117,9 @@ _item_focus_down(Elm_Gengrid_Data *sd)
if (!sd->focused_item)
{
next = ELM_GEN_ITEM_FROM_INLIST(sd->items);
while (((next) && (next->generation < sd->generation))
|| elm_object_item_disabled_get(EO_OBJ(next)))
while (next &&
(next->generation < sd->generation
|| elm_object_item_disabled_get(EO_OBJ(next))))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
}
else