Resolve SVACE issues.

This patch resolve following SVACE issues:
306026, 342521, 342524, 342525,
342526, 342527, 342528, 342529

Change-Id: Ib8f1a275fe6a566f5c3756db9d69bfbe4e8fed2f

diff --git a/src/apps/apps_data_db.c b/src/apps/apps_data_db.c
index cbc977d87fa01304c5c6cd425506c4949d474607..02d8e2d449969f5b42b2d4ca522be4e049ebe706 100755 (executable)
--- a/src/apps/apps_data_db.c
+++ b/src/apps/apps_data_db.c
@@ -134,12 +134,16 @@ bool apps_data_db_icon_update(APP_INFO *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return false;
        }
        __close_db_connector();
        return true;
 
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return false;
 
@@ -174,7 +178,8 @@ int apps_data_db_icon_insert(APP_INFO *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return INVALID_VALUE;
        }
        id = (int)sqlite3_last_insert_rowid(s_info.db_connector);
 
@@ -182,6 +187,9 @@ int apps_data_db_icon_insert(APP_INFO *item)
        return id;
 
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return INVALID_VALUE;
 
@@ -208,13 +216,17 @@ bool apps_data_db_icon_delete(APP_INFO *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return false;
        }
 
        __close_db_connector();
        return true;
 
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return false;
 }
@@ -240,14 +252,17 @@ bool apps_data_db_icon_delete_all(void)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return false;
        }
        __close_db_connector();
        return true;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return false;
-
 }
 
 Eina_List *apps_data_db_get_icon_list(void)
@@ -291,7 +306,9 @@ Eina_List *apps_data_db_get_icon_list(void)
                        list = eina_list_append(list, item);
                }
        }
-       sqlite3_finalize(stmt);
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error : [%d]", ret);
        __close_db_connector();
 
        return list;
@@ -321,13 +338,17 @@ char *apps_data_db_get_data(char *key)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return NULL;
        }
        __close_db_connector();
 
        return value;
 
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return NULL;
 }
@@ -449,12 +470,16 @@ static bool __update_data_value(char *key, char *value)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return false;
        }
 
        __close_db_connector();
        return true;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return false;
 }
@@ -482,7 +507,8 @@ static int __insert_data_value(char *key, char *value)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _E("sqlite error [%d]", ret);
-               goto ERROR;
+               __close_db_connector();
+               return INVALID_VALUE;
        }
 
        idx = (int)sqlite3_last_insert_rowid(s_info.db_connector);
@@ -490,7 +516,9 @@ static int __insert_data_value(char *key, char *value)
        __close_db_connector();
        return idx;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _E("sqlite error [%d]", ret);
        __close_db_connector();
        return INVALID_VALUE;
-
 }

diff --git a/src/apps/apps_db.c b/src/apps/apps_db.c
index e661aee0f5308fcafa4548050eda794fd2f262df..83ee7496f812f922792b6508b440bd41fdfd7566 100755 (executable)
--- a/src/apps/apps_db.c
+++ b/src/apps/apps_db.c
@@ -130,13 +130,17 @@ bool apps_db_update(apps_data_s *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _APPS_E("sqlite error [%d]", ret);
-               goto ERROR;
+               apps_db_close();
+               return false;
        }
 
        apps_db_close();
        return true;
 
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _APPS_E("sqlite error [%d]", ret);
        apps_db_close();
        return false;
 }
@@ -168,7 +172,8 @@ bool apps_db_insert(apps_data_s *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _APPS_E("sqlite error [%d]", ret);
-               goto ERROR;
+               apps_db_close();
+               return false;
        }
 
        item->db_id = (int)sqlite3_last_insert_rowid(apps_db);
@@ -176,6 +181,9 @@ bool apps_db_insert(apps_data_s *item)
        apps_db_close();
        return true;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _APPS_E("sqlite error [%d]", ret);
        apps_db_close();
        return false;
 }
@@ -201,12 +209,16 @@ bool apps_db_delete(apps_data_s *item)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _APPS_E("sqlite error [%d]", ret);
-               goto ERROR;
+               apps_db_close();
+               return false;
        }
 
        apps_db_close();
        return true;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _APPS_E("sqlite error [%d]", ret);
        apps_db_close();
        return false;
 }
@@ -249,12 +261,16 @@ bool apps_db_get_list(Eina_List **apps_db_list)
        ret = sqlite3_finalize(stmt);
        if (ret != SQLITE_OK) {
                _APPS_E("sqlite error [%d]", ret);
-               goto ERROR;
+               apps_db_close();
+               return false;
        }
 
        apps_db_close();
        return true;
 ERROR:
+       ret = sqlite3_finalize(stmt);
+       if (ret != SQLITE_OK)
+               _APPS_E("sqlite error [%d]", ret);
        apps_db_close();
        return false;
 }

diff --git a/src/apps/apps_state_edit.c b/src/apps/apps_state_edit.c
index 524b965796201e39f2cbec0fee09493e4644d7ab..4a0f94782270dcd9104fd4ac50ca715085bd5288 100755 (executable)
--- a/src/apps/apps_state_edit.c
+++ b/src/apps/apps_state_edit.c
@@ -240,9 +240,11 @@ static void __uninstall_cb(void *data, Evas_Object *obj, void *event_info)
                LOGE("Could not destroy unistall request. App: %s", pkg_id);
                goto END;
        }
+       return;
 END:
        if (request != NULL)
                package_manager_request_destroy(request);
+       return;
 }
 
 static void __uninstall_app(APP_INFO *app_info, int pos)

diff --git a/src/notification/noti_detail_view.c b/src/notification/noti_detail_view.c
index 90ca32598c80f6716d66844cf98d7b85b4d09845..7a1b3597adf062217dfbe715f79fd8e1be6a1934 100755 (executable)
--- a/src/notification/noti_detail_view.c
+++ b/src/notification/noti_detail_view.c
@@ -654,6 +654,7 @@ static void _noti_detail_view_set_contents(Eina_Bool is_popup)
                        strncat(_noti_detail_view_data_s.up_screen_text, content_text, strlen(content_text));
 
                free(text_time);
+               text_time = NULL;
        }
 
        Evas_Object *bottom_spacer = _noti_create_detail_view_item_layout("detail_bottom_space");
@@ -678,7 +679,7 @@ static void _noti_detail_view_set_contents(Eina_Bool is_popup)
 
        _noti_detail_view_data_s.bottom_spacer = bottom_spacer;
        evas_object_data_set(bottom_spacer, DATA_KEY_APP_NAME, app_name);
-       if (text_time)
+       if (text_time != NULL)
                free(text_time);
 
        return;