Add codes to check null pointer

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

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index debd274c0646b4e9a007b6801af5d00072929497..696d7041d6a9e5f3d7d38cbde2a896b539de878a 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -1123,13 +1123,10 @@ static void __creat_name_view(void *data)
        item_data->input_panel_disable_flag = EINA_FALSE;
 
        ad->item_dev_name = item_data;
-       if (ad->item_dev_name) {
-               __BACK_POINTER_SET(ad->item_dev_name);
-               elm_genlist_item_select_mode_set(ad->item_dev_name->item,
-                               ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-       } else {
-               SETTING_TRACE_ERROR("ad->item_dev_name is NULL");
-       }
+
+       __BACK_POINTER_SET(ad->item_dev_name);
+       elm_genlist_item_select_mode_set(ad->item_dev_name->item,
+                       ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        FREE(pa_sub_desc);
 

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 0acb1e953c74307750dab79a19d0b81c5ec9294e..4ac7afe9c4592786642cc0ccefd8dd7c6f6d2cb7 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -201,6 +201,12 @@ static void setting_time_main_int_vconf_change_cb(keynode_t *key, void *data)
                else
                        time = __setting_phone_lang_get_by_pattern(lang, "Hm");
 
+               if (NULL == time) {
+                       SETTING_TRACE_ERROR("time is NULL");
+                       FREE(pa_time_format);
+                       return;
+               }
+
                strncpy(time_arr, time, DEF_BUF_SIZE);
                time_arr[DEF_BUF_SIZE - 1] = '\0';
                FREE(time);
@@ -1274,7 +1280,10 @@ static void __setting_update_datefield_cb(void *cb)
                                "string with error code %d", err);
        }
        char *pa_time_format = get_pa_time_format_str();
-       setting_retm_if(NULL == pa_time_format, "pa_time_format is NULL");
+       if (NULL == pa_time_format) {
+               SETTING_TRACE_ERROR("pa_time_format is NULL");
+               return;
+       }
 
        char *date = __setting_phone_lang_get_by_pattern(region, "MMM/d/yyyy");
        char *time = NULL;
@@ -1287,6 +1296,14 @@ static void __setting_update_datefield_cb(void *cb)
        else
                time = __setting_phone_lang_get_by_pattern(region, "Hm");
 
+       if (NULL == date || NULL == time) {
+               SETTING_TRACE_ERROR("date time is NULL");
+               FREE(date);
+               FREE(time);
+               FREE(pa_time_format);
+               return;
+       }
+
        memcpy(date_arr, date, DEF_BUF_SIZE);
        memcpy(time_arr, time, DEF_BUF_SIZE);
        date_arr[DEF_BUF_SIZE - 1] = '\0';