[Non-ACR][Critical Coverity Fixes]

Change-Id: Iae3652216d9eef56e2d0c9d2bafa90e78dbe4c35
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/common/phn-dbus-utils.c b/common/phn-dbus-utils.c
index df08081c7e0524cf7deb0c9e461881d86087e3db..34972051d9f1df464e1a679882fe843b70a4f665 100644 (file)
--- a/common/phn-dbus-utils.c
+++ b/common/phn-dbus-utils.c
@@ -117,6 +117,7 @@ int phn_dbus_utils_gvariant_to_array(GVariant *arg_list, phone_number_blocking_r
                if (NULL == array) {
                        /* LCOV_EXCL_START */
                        ERR("calloc() fail");
+                       g_slist_free_full(list, phn_record_free);
                        return PHONE_NUMBER_ERROR_OUT_OF_MEMORY;
                        /* LCOV_EXCL_STOP */
                }

diff --git a/daemon/phnd-region-data.c b/daemon/phnd-region-data.c
index 5d0262d27086d066730d7732cae5cacd56a5926d..55dd12cbe0d4820599f6b84bc16d2a25a53fa0a4 100644 (file)
--- a/daemon/phnd-region-data.c
+++ b/daemon/phnd-region-data.c
@@ -403,15 +403,15 @@ int phn_region_data_get_region_str(phone_number_region_e region, char **region_s
        if (PHONE_NUMBER_REGION_SYSTEM == region) {
                char *str = NULL;
                ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &str);
-               if (str)
-                       *region_str = g_strdup(strchr(str, '_') + 1);
-               free(str);
                if (SYSTEM_SETTINGS_ERROR_NONE != ret) {
                        /* LCOV_EXCL_START */
                        ERR("system_settings_get_value_string() Fail(%d)", ret);
                        return PHONE_NUMBER_ERROR_NOT_SUPPORTED;
                        /* LCOV_EXCL_STOP */
                }
+               if (str)
+                       *region_str = g_strdup(strchr(str, '_') + 1);
+               free(str);
                return PHONE_NUMBER_ERROR_NONE;
        }