From: Kiseok Chang Date: Tue, 17 Sep 2019 07:20:51 +0000 (+0900) Subject: Fix potential errors & Privilege X-Git-Tag: submit/tizen/20191008.013418~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a8f7e637cb1f7ccb6a6111dc3669eee2b7ea73c;p=profile%2Fmobile%2Fapps%2Fnative%2Fsettings.git Fix potential errors & Privilege Change-Id: I0e0b1c84ee8597f0fceaa7a98d05fc14bc805c66 Signed-off-by: Kiseok Chang --- diff --git a/setting-main/tizen-manifest.xml b/setting-main/tizen-manifest.xml index 812ff1d5..fb4ec66b 100644 --- a/setting-main/tizen-manifest.xml +++ b/setting-main/tizen-manifest.xml @@ -88,6 +88,7 @@ http://tizen.org/privilege/systemmonitor http://tizen.org/privilege/systemsettings.admin http://tizen.org/privilege/content.read + http://tizen.org/privilege/content.write http://tizen.org/privilege/network.set http://tizen.org/privilege/account.write http://tizen.org/privilege/nfc.admin @@ -104,5 +105,6 @@ http://tizen.org/privilege/internet http://tizen.org/privilege/notification http://tizen.org/privilege/packagemanager.admin + http://tizen.org/privilege/appdir.shareddata diff --git a/setting-storage/src/setting-storage-applications.c b/setting-storage/src/setting-storage-applications.c index ddfb71e1..e2587ade 100644 --- a/setting-storage/src/setting-storage-applications.c +++ b/setting-storage/src/setting-storage-applications.c @@ -880,6 +880,7 @@ static void _move_to_sd(SettingStorage *ad) it = elm_genlist_item_next_get(it); } + package_manager_request_destroy(request); _update_ui_list(ad); diff --git a/setting-storage/src/setting-storage-miscellaneous.c b/setting-storage/src/setting-storage-miscellaneous.c index 273997f7..3abfd13d 100644 --- a/setting-storage/src/setting-storage-miscellaneous.c +++ b/setting-storage/src/setting-storage-miscellaneous.c @@ -272,13 +272,15 @@ static Eina_Bool __misc_view_pop_cb(void *data, Elm_Object_Item *it) static bool __media_item_cb(media_info_h media, void *data) { + int ret = MEDIA_CONTENT_ERROR_NONE; Node_Info *node = NULL; SettingStorage *ad = data; char *file_path = NULL; retv_if((!media || !data), true); - media_info_get_file_path(media, &file_path); + ret = media_info_get_file_path(media, &file_path); + retv_if(MEDIA_CONTENT_ERROR_NONE != ret, true); if (!ecore_file_exists(file_path)) { free(file_path); return true; @@ -288,7 +290,9 @@ static bool __media_item_cb(media_info_h media, void *data) if (node) { media_info_get_media_id(media, &node->id); node->size_str = strdup(file_path); - media_info_get_display_name(media, &node->name); + ret = media_info_get_display_name(media, &node->name); + if (MEDIA_CONTENT_ERROR_NONE != ret) + node->name = strdup(""); media_info_get_size(media, &node->size); media_info_get_added_time(media, &node->added_time); ad->data_list = eina_list_append(ad->data_list, node); diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c index 04d38b12..91d84b70 100644 --- a/setting-time/src/setting-time-main.c +++ b/setting-time/src/setting-time-main.c @@ -238,11 +238,16 @@ static void __update_time_via_sim_card(void *data) int ret = 0; int t_nitz = 0; int t_offset = 0; - ret += vconf_get_int(VCONFKEY_TELEPHONY_NITZ_GMT, &t_nitz); - ret += vconf_get_int(VCONFKEY_TELEPHONY_NITZ_EVENT_GMT, &t_offset); + ret = vconf_get_int(VCONFKEY_TELEPHONY_NITZ_GMT, &t_nitz); + ret_if(ret != 0); + ret = vconf_get_int(VCONFKEY_TELEPHONY_NITZ_EVENT_GMT, &t_offset); + ret_if(ret != 0); + char *tzpath = vconf_get_str(VCONFKEY_TELEPHONY_NITZ_ZONE); - ret_if(ret != 0 || isEmptyStr(tzpath)); - ret = 0; /*reset.. */ + if(isEmptyStr(tzpath)) { + FREE(tzpath); + return; + } /* a.time zone */ SETTING_TRACE("tzpath : %s", tzpath); @@ -379,7 +384,7 @@ static void __sim_time_info_chg_cb(keynode_t *key, void *data) elm_object_item_disabled_set(ad->data_tz->item, EINA_FALSE); if (ad->data_time) elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE); - + FREE(tzpath); return; } FREE(tzpath);