gengrid: fix dereferenced case by checking NULL value.
authorMyoungwoon Roy, Kim <myoungwoon.kim@samsung.com>
Fri, 25 Nov 2016 02:21:14 +0000 (11:21 +0900)
committerTaehyub Kim <taehyub.kim@samsung.com>
Tue, 29 Nov 2016 12:32:36 +0000 (21:32 +0900)
Change-Id: I6c4352e62da5def43c7d6bfb4f5de584bfea7b26

src/lib/elm_gengrid.c

index fc348980732187ec2e6bc9270495cc36a556dfb3..f823a1cdbbb42ad25d47a2a30c671067055789c6 100644 (file)
@@ -2412,8 +2412,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
@@ -2452,8 +2453,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
@@ -2502,8 +2504,9 @@ _item_focus_left(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
@@ -2536,8 +2539,9 @@ _item_focus_right(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