[Prevent defect fixes]: elc_navigationbar_ex: 20519: RESOURCE LEAK
authorShilpa Singh <shilpa.singh@samsung.com>
Wed, 17 Aug 2011 09:07:06 +0000 (18:07 +0900)
committerShilpa Singh <shilpa.singh@samsung.com>
Wed, 17 Aug 2011 09:07:06 +0000 (18:07 +0900)
edje_externals/elm_colorpalette: 22278: REVERSE_INULL
elm_pagecontrol: 19163,19162: REVERSE_INULL

Change-Id: I32ad9332dca458cb983490a96eee55577248c17d

src/edje_externals/elm_colorpalette.c
src/lib/elc_navigationbar_ex.c
src/lib/elm_pagecontrol.c

index d49dba9..00bc880 100644 (file)
@@ -147,10 +147,12 @@ static Evas_Object *external_colorpalette_content_get(void *data __UNUSED__,
 static void
 external_colorpalette_params_free(void *params)
 {
-       Elm_Params_colorpalette *mem = params;
-    if(mem->color)free(mem->color);
-       if(mem->color_set)free(mem->color_set) ;
-       if(mem)free(mem);
+   Elm_Params_colorpalette *mem = params;
+   if (mem->color)
+     free(mem->color);
+   if (mem->color_set)
+     free(mem->color_set) ;
+   free(params);
 }
 
 static Edje_External_Param_Info external_colorpalette_params[] = {
index 710ac0a..2c9a1b1 100644 (file)
@@ -530,12 +530,13 @@ elm_navigationbar_ex_item_push(Evas_Object *obj, Evas_Object *content, const cha
 {\r
    ELM_CHECK_WIDTYPE(obj, widtype)NULL;\r
    Widget_Data *wd = elm_widget_data_get(obj);\r
-   Elm_Navigationbar_ex_Item *it = ELM_NEW(Elm_Navigationbar_ex_Item);\r
+   Elm_Navigationbar_ex_Item *it;\r
    Evas_Coord x, y, w, h;\r
    char buf[1024];\r
    if (!wd) return NULL;\r
    if (!content) return NULL;\r
    if (!item_style) return NULL;\r
+   it = ELM_NEW(Elm_Navigationbar_ex_Item);\r
    if (!it) return NULL;\r
    it->obj = obj;\r
    it->content = content;\r
index d5ee8db..630bff2 100644 (file)
@@ -62,16 +62,14 @@ _item_free(Evas_Object *obj, Page_Item *it)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   if (!it) return;
 
    if (wd->page_list)
      wd->page_list = eina_list_remove(wd->page_list, it);
 
    if (it->base) evas_object_del(it->base);
 
-   if (it) free(it);
-   it = NULL;
-
-   return;
+   free(it);
 }
 
 static void
@@ -80,14 +78,11 @@ _del_hook(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    Page_Item *it;
    Eina_List *l, *clear = NULL;
+   if (!wd) return;
 
    EINA_LIST_FOREACH(wd->page_list, l, it) clear = eina_list_append(clear, it);
    EINA_LIST_FREE(clear, it) _item_free(obj, it);
-
-   if (wd) free(wd);
-   wd = NULL;
-
-   return;
+   free(wd);
 }
 
 static Page_Item *