From: Kiseok Chang Date: Fri, 24 Jul 2020 05:19:12 +0000 (+0900) Subject: Add codes to check null X-Git-Tag: submit/tizen/20200727.014020^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fe3c6f40d6029c7e450dab1d616831ba1d361b9;p=profile%2Fcommon%2Fapps%2Fnative%2Fsettings.git Add codes to check null - check return value from setting_create_Gendial_field_def() Change-Id: I07493abe833d02549959af7fff64931c20b29c74 Signed-off-by: Kiseok Chang --- diff --git a/setting-about/src/setting-about-status.c b/setting-about/src/setting-about-status.c index 50110ea..1b62883 100644 --- a/setting-about/src/setting-about-status.c +++ b/setting-about/src/setting-about-status.c @@ -287,6 +287,9 @@ static int __generate_genlist(void *data) &(ad->itc_2text_2), NULL, ad, SWALLOW_Type_INVALID, NULL, NULL, 0, _("IDS_ST_MBODY_BLUETOOTH_ADDRESS"), str, NULL); + if (!ad->item_data_bt) { + SETTING_TRACE_ERROR("ad->item_data_bt is NULL"); + } /* [UI] Wi-Fi MAC address */ __get_wifi_mac_address(str, sizeof(str)); @@ -300,6 +303,9 @@ static int __generate_genlist(void *data) ad->item_data_storage = setting_create_Gendial_field_def(ad->status_gl, &(ad->itc_2text_2), NULL, ad, SWALLOW_Type_INVALID, NULL, NULL, 0, _("IDS_ST_BODY_STORAGE"), str, NULL); + if (!ad->item_data_storage) { + SETTING_TRACE_ERROR("ad->item_data_storage is NULL"); + } /* [UI] CPU usage */ ret = __stat_get_cpuinfo(&usr, &sys); @@ -313,9 +319,8 @@ static int __generate_genlist(void *data) ad->item_data_cpu = setting_create_Gendial_field_def(ad->status_gl, &(ad->itc_2text_2), NULL, ad, SWALLOW_Type_INVALID, NULL, NULL, 0, _("IDS_ST_BODY_CPU_USAGE"), str, NULL); - if (ad->item_data_cpu) { + if (ad->item_data_cpu) __BACK_POINTER_SET(ad->item_data_cpu); - } elm_genlist_select_mode_set(ad->status_gl, ELM_OBJECT_SELECT_MODE_NONE); diff --git a/setting-common/include/setting-common-draw-widget.h b/setting-common/include/setting-common-draw-widget.h index 44f95e3..f10e030 100755 --- a/setting-common/include/setting-common-draw-widget.h +++ b/setting-common/include/setting-common-draw-widget.h @@ -19,8 +19,8 @@ * */ /** - *default group setting-common-draw-widget - *common UI code for reuse + * default group setting-common-draw-widget + * common UI code for reuse */ #ifndef __SETTING_COMMON_DRAW_WIDGET_H__ #define __SETTING_COMMON_DRAW_WIDGET_H__ diff --git a/setting-language-and-input/src/setting-language-and-input-view.c b/setting-language-and-input/src/setting-language-and-input-view.c index 6c1c235..b0b0abd 100755 --- a/setting-language-and-input/src/setting-language-and-input-view.c +++ b/setting-language-and-input/src/setting-language-and-input-view.c @@ -307,6 +307,8 @@ static int _view_create(void *cb) SWALLOW_Type_INVALID, NULL, NULL, 0, "IDS_ST_BODY_KEYBOARD", NULL, NULL); + if (!ad->data_keyboard) + SETTING_TRACE_ERROR("ad->data_keyboard is NULL"); /* Speech */ ad->data_title_speech = setting_create_Gendial_field_titleItem(ad->md.genlist, diff --git a/setting-notifications/src/setting-notifications-main.c b/setting-notifications/src/setting-notifications-main.c index b133ed3..8adf9fa 100644 --- a/setting-notifications/src/setting-notifications-main.c +++ b/setting-notifications/src/setting-notifications-main.c @@ -103,6 +103,9 @@ static void _get_lite_main_list(void *data) "IDS_ST_MBODY_DO_NOT_DISTURB_ABB", sub_desc, NULL); + if (!ad->data_do_not_disturb) + SETTING_TRACE_ERROR("ad->data_do_not_disturb is NULL"); + /* Notifications - App notifications */ setting_create_Gendial_field_def( genlist, diff --git a/setting-profile/src/setting-profile-other-sounds-view.c b/setting-profile/src/setting-profile-other-sounds-view.c index af25aeb..0a4400a 100644 --- a/setting-profile/src/setting-profile-other-sounds-view.c +++ b/setting-profile/src/setting-profile-other-sounds-view.c @@ -90,7 +90,7 @@ static int _view_create(void *cb) for (int i = 0; i < ARRAY_SIZE(items); i++) { struct item *it = &items[i]; - Setting_GenGroupItem_Data *id = setting_create_Gendial_field_def(genlist, + Setting_GenGroupItem_Data *id = setting_create_Gendial_field_def(genlist, &itc, NULL, it, @@ -101,7 +101,8 @@ static int _view_create(void *cb) it->label, it->sublabel, _checkbox_changed_cb); - if (id) id->userdata = it; + if (id) + id->userdata = it; } SETTING_TRACE_END; diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c index b304ee1..fe4e8f1 100755 --- a/setting-profile/src/setting-profile-sound-main.c +++ b/setting-profile/src/setting-profile-sound-main.c @@ -516,6 +516,8 @@ static void _get_lite_main_list(void *data) "Sound Mode", setting_profile_sound_mode_to_string(mode), NULL); + if (!ad->sound_mode) + SETTING_TRACE_ERROR("ad->sound_mode is NULL"); /* separator */ setting_create_Gendial_field_titleItem( @@ -539,6 +541,9 @@ static void _get_lite_main_list(void *data) "Notifications", display_name, NULL); + if (!ad->data_msg_alert_tone) + SETTING_TRACE_ERROR("ad->data_msg_alert_tone is NULL"); + free(display_name); /* Other sounds */ setting_create_Gendial_field_def( @@ -574,7 +579,10 @@ static void _get_lite_main_list(void *data) _("IDS_ST_BODY_MEDIA"), NULL, NULL); - group_item_data->hide_bottom_line = TRUE; + if (group_item_data) + group_item_data->hide_bottom_line = TRUE; + else + SETTING_TRACE_ERROR("group_item_data is NULL"); /* 5.media volume */ if (sound_manager_get_volume(SOUND_TYPE_MEDIA, &mm_value) @@ -625,7 +633,10 @@ static void _get_lite_main_list(void *data) _("IDS_ST_BODY_NOTIFICATIONS"), NULL, NULL); - group_item_data->hide_bottom_line = TRUE; + if (group_item_data) + group_item_data->hide_bottom_line = TRUE; + else + SETTING_TRACE_ERROR("group_item_data is NULL"); /* 4.noti volumn */ if (sound_manager_get_volume(SOUND_TYPE_NOTIFICATION, &mm_value) @@ -670,7 +681,10 @@ static void _get_lite_main_list(void *data) _("IDS_ST_BODY_SYSTEM"), NULL, NULL); - group_item_data->hide_bottom_line = TRUE; + if (group_item_data) + group_item_data->hide_bottom_line = TRUE; + else + SETTING_TRACE_ERROR("group_item_data is NULL"); left_icon = setting_sound_get_slider_icon(SND_SLIDER_SYSTEM, mm_value); ADD_SOUND_SLIDER( diff --git a/setting-softkey/src/setting-softkey-main.c b/setting-softkey/src/setting-softkey-main.c index 6032d7b..bc5e6d8 100644 --- a/setting-softkey/src/setting-softkey-main.c +++ b/setting-softkey/src/setting-softkey-main.c @@ -73,9 +73,10 @@ static void _get_lite_main_list(void *data) _(IDS_ST_BODY_ALWAYS_ON), NULL, _softkey_toogle_chk_cb); + if (!ad->data_softkey_toogle) + SETTING_TRACE_ERROR("ad->data_softkey_toogle is NULL"); ad->md.genlist = genlist; - } static void _click_softkey_back_cb(void *data, diff --git a/setting-storage/src/setting-storage-default.c b/setting-storage/src/setting-storage-default.c index 1126917..a15b4d3 100755 --- a/setting-storage/src/setting-storage-default.c +++ b/setting-storage/src/setting-storage-default.c @@ -221,8 +221,8 @@ void storage_append_default_storage_info(SettingStorage *ad, SWALLOW_Type_INVALID, NULL, NULL, 0, "IDS_SM_TMBODY_DEFAULT_STORAGE_LOCATIONS", NULL, NULL); - - ad->default_storage->data_type = DATA_TYPE_MAX; + if (ad->default_storage) + ad->default_storage->data_type = DATA_TYPE_MAX; } static void _cancel_btn_clicked_cb(void *data, Evas_Object *obj, @@ -324,9 +324,11 @@ static int storage_default_create(void *data) NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZATION_X, NULL, NULL, 0, _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"), NULL, NULL); - setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL"); - elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - ad->help_bt = it; + if (it) { + setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL"); + elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + ad->help_bt = it; + } ad->data_bt = storage_default_items_create(ad, genlist, INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH); @@ -342,10 +344,11 @@ static int storage_default_create(void *data) NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZATION_X, NULL, NULL, 0, _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"), NULL, NULL); - - setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL"); - elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - ad->help_installapp = it; + if (it) { + setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL"); + elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + ad->help_installapp = it; + } ad->data_installapp = storage_default_items_create(ad, genlist, INT_SLP_SETTING_DEFAULT_MEM_INSTALLAPPLICATIONS); diff --git a/setting-storage/src/setting-storage-miscellaneous.c b/setting-storage/src/setting-storage-miscellaneous.c index ee0677a..d6c695a 100755 --- a/setting-storage/src/setting-storage-miscellaneous.c +++ b/setting-storage/src/setting-storage-miscellaneous.c @@ -485,7 +485,6 @@ static void __gl_append_items(SettingStorage *ad) SWALLOW_Type_1CHECK_RIGHT_INVISIBLE, NULL, NULL, 0, node->name, node->size_str, __genlist_chk_cb); - if (item_data) { item_data->userdata = node; node->data = item_data; diff --git a/setting-storage/src/setting-storage-utils.c b/setting-storage/src/setting-storage-utils.c index ffa3dc8..c11c8ec 100755 --- a/setting-storage/src/setting-storage-utils.c +++ b/setting-storage/src/setting-storage-utils.c @@ -581,7 +581,6 @@ void storage_append_select_all_item(SettingStorage *ad, &(ad->itc_1text), c1, ad, SWALLOW_Type_1CHECK, NULL, NULL, 0, _("IDS_ST_BODY_SELECT_ALL"), NULL, c2); - if (item_data) { item_data->userdata = ad; item_data->isItemHideFlag = true; diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c index 8a63e06..891e336 100755 --- a/setting-time/src/setting-time-main.c +++ b/setting-time/src/setting-time-main.c @@ -1003,7 +1003,6 @@ static int setting_time_main_create(void *cb) "IDS_ST_MBODY_24_HOUR_CLOCK", "IDS_ST_SBODY_SHOW_THE_TIME_IN_24_HOUR_FORMAT_INSTEAD_OF_12_HOUR_HAM_PM_FORMAT", setting_time_main_chk_btn_cb); - if (ad->data_time_fmt) { __BACK_POINTER_SET(ad->data_time_fmt); ad->data_time_fmt->userdata = ad; @@ -1737,7 +1736,7 @@ static char *get_timezone_displayname() } i18n_ustring_to_UTF8(timezone_str, len_str, &len_utf8, displayName, len, &status); - SETTING_TRACE("*************************** timezone : %s, %s", + SETTING_TRACE("*************************** timezone : %s, %s", (char *)displayName, (char *)timezone_str); } i18n_ucalendar_destroy(cal);