Svace issue fix

Change-Id: Id36bc81ef12a3cfd18b562f31b307e9b37e88883

diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 4a686aa..7454bf7 100755 (executable)
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -269,6 +269,10 @@ static bool __apps_data_pkg_get_apps_info(app_info_h app_handle, app_data_t **it
                if (new_item->icon_path_str) free(new_item->icon_path_str);
 
                new_item->icon_path_str = malloc(MAX_FILE_PATH_LEN);
+               if (!new_item->icon_path_str) {
+                       __E("Malloc unable to assign memory for icon_path_str");
+                       goto ERROR;
+               }
                snprintf(new_item->icon_path_str, MAX_FILE_PATH_LEN, "%s", util_get_res_file_path(IMAGE_DIR"/default_app_icon.png"));
        }
        return true;
@@ -350,7 +354,7 @@ static void __apps_app_manager_disable_app(const char *app_id)
        Eina_List *find_list;
 
        EINA_LIST_FOREACH(list, find_list, item) {
-               if (item != NULL && !strcmp(item->app_id,app_id)) {
+               if (item != NULL && !strcmp(item->app_id, app_id)) {
                        apps_data_delete_item(item);
                        break;
                }

diff --git a/src/apps_view.c b/src/apps_view.c
index 8f94ead..3d7e0e0 100755 (executable)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -225,6 +225,9 @@ void apps_view_show_anim(double pos)
                return;
        }
        Edje_Message_Float_Set *msg = malloc(sizeof(*msg) + sizeof(double));
+       if (!msg) {
+               return;
+       }
        msg->count = 1;
        msg->val[0] = pos*APPS_VIEW_BG_OPACITY;
 
@@ -251,6 +254,9 @@ void apps_view_hide_anim(double pos)
                return;
        }
        Edje_Message_Float_Set *msg = malloc(sizeof(*msg) + 3 * sizeof(double));
+       if (!msg) {
+               return;
+       }
        msg->count = 3;
        msg->val[0] = ((APPS_VIEW_ANIMATION_DELTA * pos) / apps_view_s.height);
        msg->val[1] = 1+((APPS_VIEW_ANIMATION_DELTA * pos) / apps_view_s.height);
@@ -296,6 +302,7 @@ void apps_view_folder_reroder(void)
        app_data_t *item = NULL;
        Eina_List *find_list;
        int item_count = 0;
+       double item_count_double = 0.0;
        if (!apps_view_s.opened_folder)
                return;
 
@@ -303,13 +310,17 @@ void apps_view_folder_reroder(void)
                if (item->parent_db_id == apps_view_s.opened_folder->db_id) {
                        apps_view_icon_set(item);
                        item_count++;
+                       item_count_double = item_count_double + 1.0;
                }
        }
 
        if (item_count < APPS_FOLDER_MAX_ITEM) {
                Edje_Message_Float_Set *msg = malloc(sizeof(*msg) + 2 * sizeof(double));
+               if (!msg) {
+                       return;
+               }
                msg->count = 2;
-               msg->val[0] = item_count / APPS_FOLDER_COL;
+               msg->val[0] = item_count_double / APPS_FOLDER_COL;
                msg->val[1] = item_count % APPS_FOLDER_COL;
 
                if (apps_view_get_state() != VIEW_STATE_CHOOSER) {
@@ -1516,7 +1527,7 @@ static void __apps_view_badge_update_icon(app_data_t *item)
                }
        }
 
-       if (item->parent_db_id != APPS_ROOT )
+       if (item->parent_db_id != APPS_ROOT)
                __apps_view_badge_update_folder(item->parent_db_id);
 }
 
@@ -1936,6 +1947,9 @@ static void __apps_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *
        __D("current page %d", apps_view_s.current_page);
 
        char *buf = (char *)malloc(sizeof(char)*1024);
+       if (!buf) {
+               return;
+       }
        snprintf(buf, 1024, _("IDS_HS_TBOPT_PAGE_P1SD_OF_P2SD"), apps_view_s.current_page + 1, apps_view_s.page_count);
        screen_reader_read(buf);
        screen_reader_update(APPS);
@@ -2013,6 +2027,9 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
 {
        if (apps_view_s.view_state == VIEW_STATE_CHOOSER) {
                access_info_t *title = (access_info_t *) malloc(sizeof(access_info_t));
+               if (!title) {
+                       return;
+               }
                title->is_access_obj = EINA_FALSE;
                title->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), APPS_CHOOSER_MIDDLE_LABEL);
                title->parent = apps_view_s.chooser_btn;
@@ -2025,6 +2042,12 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
                *list = eina_list_append(*list, title);
 
                access_info_t *cancel_btn = (access_info_t *) malloc(sizeof(access_info_t));
+               if (!cancel_btn) {
+                       if (title) {
+                               free(title);
+                       }
+                       return;
+               }
                cancel_btn->is_access_obj = EINA_FALSE;
                cancel_btn->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), "chooser_left_clickable_space");
                cancel_btn->parent = apps_view_s.chooser_btn;
@@ -2037,6 +2060,11 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
                *list = eina_list_append(*list, cancel_btn);
 
                access_info_t *done_btn = (access_info_t *) malloc(sizeof(access_info_t));
+               if (!done_btn) {
+                       free(cancel_btn);
+                       free(title);
+                       return;
+               }
                done_btn->is_access_obj = EINA_FALSE;
                done_btn->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), "chooser_right_clickable_space");
                done_btn->parent = apps_view_s.chooser_btn;
@@ -2062,6 +2090,9 @@ static void __apps_view_get_access_page_app_icon(Eina_List **list)
                                char buf[STR_MAX] = { 0, };
 
                                access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                               if (!info) {
+                                       return;
+                               }
                                info->is_access_obj = EINA_FALSE;
                                info->target = item->app_layout;
                                info->parent = item->app_layout;
@@ -2120,6 +2151,9 @@ static void __apps_view_get_access_page_icon_delete_button(Eina_List **list)
                                int page_index = item->position / (APPS_VIEW_COL*APPS_VIEW_ROW);
                                if (page_index == apps_view_s.current_page) {
                                        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                                       if (!info) {
+                                               return;
+                                       }
                                        info->is_access_obj = EINA_FALSE;
                                        info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(item->app_layout), APPS_ICON_UNINSTALL_BUTTON);
                                        info->parent = item->app_layout;
@@ -2156,6 +2190,9 @@ static void __apps_view_get_access_folder_entry(Eina_List **list)
        folder_text = elm_object_text_get(apps_view_s.folder_title_entry);
 
        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+       if (!info) {
+               return;
+       }
        info->is_access_obj = EINA_FALSE;
        info->target = apps_view_s.folder_title_entry;
        info->parent = apps_view_s.opened_folder->folder_layout;
@@ -2182,6 +2219,9 @@ static void __apps_view_get_access_folder_icon(Eina_List **list)
        EINA_LIST_FOREACH(data_list, find_list, item) {
                if (item->parent_db_id == apps_view_s.opened_folder->db_id) {
                        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                       if (!info) {
+                               return;
+                       }
                        info->is_access_obj = EINA_FALSE;
                        info->target = item->app_layout;
                        info->parent = apps_view_s.opened_folder->folder_layout;
@@ -2201,6 +2241,9 @@ static void __apps_view_get_access_folder_icon(Eina_List **list)
                int pos = item_count;
                if (apps_view_s.view_state != VIEW_STATE_CHOOSER) {
                        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                       if (!info) {
+                               return;
+                       }
                        info->is_access_obj = EINA_FALSE;
                        info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(apps_view_s.folder_popup_ly), APPS_FOLDER_PLUS_ICON);
                        info->parent = apps_view_s.win;
@@ -2227,6 +2270,9 @@ static void __apps_view_get_access_folder_icon_delete_button(Eina_List **list)
        EINA_LIST_FOREACH(data_list, find_list, item) {
                if (item->parent_db_id == apps_view_s.opened_folder->db_id) {
                        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                       if (!info) {
+                               return;
+                       }
                        info->is_access_obj = EINA_FALSE;
                        info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(item->app_layout), APPS_ICON_UNINSTALL_BUTTON);
                        info->parent = item->app_layout;

diff --git a/src/cluster_page.c b/src/cluster_page.c
index f2aa1eb..6116ab7 100755 (executable)
--- a/src/cluster_page.c
+++ b/src/cluster_page.c
@@ -131,7 +131,7 @@ bool cluster_page_check_empty_space(cluster_page_t *page, widget_size_type_e typ
        int i, j;
        __cluster_page_get_widget_size(type, &w, &h);
 
-       if (!(pos_x >= 0 && pos_x <=CLUSTER_COL && pos_y >=0 && pos_y <=CLUSTER_ROW))
+       if (!(pos_x >= 0 && pos_x <= CLUSTER_COL && pos_y >= 0 && pos_y <= CLUSTER_ROW))
                return false;
 
        for (i = 0; i < h; i++) {
@@ -203,6 +203,9 @@ void cluster_page_get_access_widget_list(cluster_page_t *page_t, Eina_List **lis
 
        EINA_LIST_FOREACH(page_t->widget_list, find_list, item) {
                access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+               if (!info) {
+                       return;
+               }
                info->is_access_obj = EINA_FALSE;
                info->target = is_edit ? item->widget_layout : item->widget_content;
                info->parent = item->widget_content;

diff --git a/src/cluster_view.c b/src/cluster_view.c
index 914336d..141f36b 100755 (executable)
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -720,6 +720,9 @@ static void __cluster_view_get_access_page_thumbnail(Eina_List **list)
                        char buf[STR_MAX] = { 0, };
                        snprintf(buf, sizeof(buf), _("IDS_HS_TBOPT_PAGE_P1SD_OF_P2SD"), page_item->page_index + 1, cluster_view_s.page_count);
                        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                       if (!info) {
+                               return;
+                       }
                        info->is_access_obj = EINA_FALSE;
                        info->target = page_item->thumbnail_ly;
                        info->parent = page_item->page_layout;
@@ -743,6 +746,9 @@ static void __cluster_view_get_access_page_delete_button(Eina_List **list)
                EINA_LIST_FOREACH(cluster_view_s.page_list, find_list, page_item) {
                        if (page_item->thumbnail_ly) {
                                access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+                               if (!info) {
+                                       return;
+                               }
                                info->is_access_obj = EINA_FALSE;
                                info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(page_item->thumbnail_ly), CLUSTER_ALLPAGE_DELETE_BUTTON);
                                info->parent = page_item->thumbnail_ly;
@@ -763,6 +769,9 @@ static void __cluster_view_get_access_add_page(Eina_List **list)
 {
        if (cluster_view_s.allpage_add_page) {
                access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
+               if (!info) {
+                       return;
+               }
                info->is_access_obj = EINA_FALSE;
                info->target = cluster_view_s.allpage_add_page;
                info->parent = cluster_view_s.allpage_grid;

diff --git a/src/homescreen-manager.c b/src/homescreen-manager.c
index 0ed9859..6b36f0e 100755 (executable)
--- a/src/homescreen-manager.c
+++ b/src/homescreen-manager.c
@@ -277,6 +277,9 @@ void app_get_access_menu_btn(Eina_List **list)
 
        menu_btn = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(main_info.btn_layout), MENU_BUTTON);
        btn_info = (access_info_t *)malloc(sizeof(access_info_t));
+       if (!btn_info) {
+               return;
+       }
        btn_info->is_access_obj = EINA_FALSE;
        btn_info->target = menu_btn;
        btn_info->parent = main_info.btn_layout;
@@ -299,6 +302,9 @@ void app_get_access_apps_btn(Eina_List **list)
 
        apps_btn = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(main_info.btn_layout), HOME_BUTTON);
        btn_info = (access_info_t *)malloc(sizeof(access_info_t));
+       if (!btn_info) {
+               return;
+       }
        btn_info->is_access_obj = EINA_FALSE;
        btn_info->target = apps_btn;
        btn_info->parent = main_info.btn_layout;
@@ -321,6 +327,9 @@ void app_get_access_home_btn(Eina_List **list)
 
        home_btn = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(main_info.btn_layout), HOME_BUTTON);
        btn_info = (access_info_t *)malloc(sizeof(access_info_t));
+       if (!btn_info) {
+               return;
+       }
        btn_info->is_access_obj = EINA_FALSE;
        btn_info->target = home_btn;
        btn_info->parent = main_info.btn_layout;
@@ -339,7 +348,7 @@ static void _print_app_control_err_to_str(app_control_error_e err)
 {
        char *err_str = NULL;
 
-       switch(err) {
+       switch (err) {
        case APP_CONTROL_ERROR_INVALID_PARAMETER:
                err_str = "APP_CONTROL_ERROR_INVALID_PARAMETER";
                break;

diff --git a/src/page_indicator.c b/src/page_indicator.c
index e247b25..d29461b 100755 (executable)
--- a/src/page_indicator.c
+++ b/src/page_indicator.c
@@ -38,6 +38,10 @@ page_indicator_t *page_indictor_create(Evas_Object *scroller)
        if (scroller == NULL)
                return NULL;
        page_indicator = (page_indicator_t *)malloc(sizeof(page_indicator_t));
+       if (!page_indicator) {
+               __E("malloc unable to assign memory to page_indicator");
+               return NULL;
+       }
        page_indicator->scroller = scroller;
        page_indicator->page_count = 0;
        page_indicator->current_page = -1;
@@ -94,8 +98,7 @@ void page_indicator_set_page_count(page_indicator_t *page_indicator, int count)
 
        if (count < PAGE_INDICATOR_MAX_PAGE_COUNT) {
                width = count * PAGE_INDICATOR_UNIT + (PAGE_INDICATOR_GAP * (count-1));
-       }
-       else {
+       } else {
                width = PAGE_INDICATOR_MAX_PAGE_COUNT * PAGE_INDICATOR_UNIT + (PAGE_INDICATOR_GAP * (PAGE_INDICATOR_MAX_PAGE_COUNT - 1));
        }
        if (page_indicator->page_count == count) {
@@ -165,15 +168,12 @@ static int __page_indicator_get_indicator_unit(int page_count, int page)
 
                if (page < center_left) {
                        indicator = page;
-               }
-               else if (page >= center_left && page <= center_right) {
+               } else if (page >= center_left && page <= center_right) {
                        indicator = PAGE_INDICATOR_CENTER_PAGE_INDEX;
-               }
-               else {
+               } else {
                        indicator = page - center_right + PAGE_INDICATOR_CENTER_PAGE_INDEX;
                }
-       }
-       else {
+       } else {
                indicator = page;
        }
 
@@ -217,8 +217,7 @@ static void __page_indicator_scroll_cb(void *data, Evas_Object *obj, void *event
 
        int i = 0;
        int max_unit_count = page_indicator->page_count < PAGE_INDICATOR_MAX_PAGE_COUNT ? page_indicator->page_count : PAGE_INDICATOR_MAX_PAGE_COUNT;
-       for (i = 0; i < max_unit_count; i++)
-       {
+       for (i = 0; i < max_unit_count; i++) {
                double angle = 0.0;
                if (i == prev_unit)
                        angle = prev_unit_angle;
@@ -253,8 +252,7 @@ static void __page_indicator_set_current_page(page_indicator_t *page_indicator)
 
        cur_indicator_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, page_indicator->current_page);
 
-       for (i = 0; i < PAGE_INDICATOR_MAX_PAGE_COUNT; i++)
-       {
+       for (i = 0; i < PAGE_INDICATOR_MAX_PAGE_COUNT; i++) {
                Evas_Object *edje = NULL;
                edje = elm_layout_edje_get(page_indicator->unit[i]);
                snprintf(cur_page_num, sizeof(cur_page_num), "%d", page_indicator->current_page + 1);
@@ -265,8 +263,7 @@ static void __page_indicator_set_current_page(page_indicator_t *page_indicator)
                if (i == cur_indicator_unit) {
                        edje_object_signal_emit(edje, SIGNAL_PAGE_INDICATOR_CURRENT, SIGNAL_SOURCE);
                        page_indicator->unit_angle[i] = 90.0;
-               }
-               else {
+               } else {
                        edje_object_signal_emit(edje, SIGNAL_PAGE_INDICATOR_DEFAULT, SIGNAL_SOURCE);
                        page_indicator->unit_angle[i] = 0.0;
                }
@@ -326,6 +323,9 @@ static void __page_indicator_unit_rotate(Evas_Object *unit, double angle, double
        }
 
        Edje_Message_Float_Set *msg = malloc(sizeof(*msg) + 2 * sizeof(double));
+       if (!msg) {
+               return;
+       }
        msg->count = 2;
        msg->val[0] = angle;
        msg->val[1] = alpha;

diff --git a/src/widget_viewer.c b/src/widget_viewer.c
index 25ace4a..1548f74 100755 (executable)
--- a/src/widget_viewer.c
+++ b/src/widget_viewer.c
@@ -241,6 +241,10 @@ void widget_viewer_resume_widget(widget_data_t *widget_data)
 access_info_t *widget_viewer_get_accessible_delete_btn(widget_data_t *widget_data)
 {
        access_info_t *btn_info = (access_info_t *)malloc(sizeof(access_info_t));
+       if (!btn_info) {
+               __E("Malloc failed to assign memory to info");
+               return NULL;
+       }
        btn_info->is_access_obj = EINA_FALSE;
        btn_info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(widget_data->widget_layout), WIDGET_DELETE_BUTTON);
        btn_info->parent = widget_data->widget_layout;