Fix potential errors & Privilege

Change-Id: I0e0b1c84ee8597f0fceaa7a98d05fc14bc805c66
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-main/tizen-manifest.xml b/setting-main/tizen-manifest.xml
index 812ff1d581a93458add84698b140882923a4f463..fb4ec66bc2f78045380c2bd0020fe19537cbc72d 100644 (file)
--- a/setting-main/tizen-manifest.xml
+++ b/setting-main/tizen-manifest.xml
@@ -88,6 +88,7 @@
         <privilege>http://tizen.org/privilege/systemmonitor</privilege>
         <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
         <privilege>http://tizen.org/privilege/content.read</privilege>
+        <privilege>http://tizen.org/privilege/content.write</privilege>
         <privilege>http://tizen.org/privilege/network.set</privilege>
         <privilege>http://tizen.org/privilege/account.write</privilege>
         <privilege>http://tizen.org/privilege/nfc.admin</privilege>
@@ -104,5 +105,6 @@
         <privilege>http://tizen.org/privilege/internet</privilege>
         <privilege>http://tizen.org/privilege/notification</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+        <privilege>http://tizen.org/privilege/appdir.shareddata</privilege>
     </privileges>
 </manifest>

diff --git a/setting-storage/src/setting-storage-applications.c b/setting-storage/src/setting-storage-applications.c
index ddfb71e1dfbb09ebb9d4d71aeec3ade9fe43c879..e2587adeb8dd6c74a5d316a2b6a4c0bbb1e6cd7e 100644 (file)
--- 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 273997f7a4ae329dff7902f6e03ab70ca48cc849..3abfd13db16eaf2e3aa7e94bd83d879dbbf9a509 100644 (file)
--- 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 04d38b12d407cfcd180b6628bfaecf9215ee5011..91d84b70bba174dd48b2bc2c7d1089c611e66e57 100644 (file)
--- 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);