diff options
| author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2016-07-04 07:29:53 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2016-07-04 07:31:15 +0900 |
| commit | 3627fa7883aee310f2966f5562f4a0e5cf7a5d58 (patch) | |
| tree | 942fb12f3826b67190760ca715b254522d008796 | |
| parent | bc7f22375453a63e7c1b71266c4f25b92a18e8ea (diff) | |
| download | efl-3627fa7883aee310f2966f5562f4a0e5cf7a5d58.tar.gz | |
elm/gengrid: Fix null pointer dereferences.
CID: 1357210 and 1357209.
| -rw-r--r-- | src/lib/elementary/elm_gengrid.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 3abe8575d4..187a60c854 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -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 |