From 1d01393b2d28e0243bb4e313fa9411e201b51d80 Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Mon, 5 Oct 2020 13:55:50 +0900 Subject: [PATCH] Fix coverity issue Change-Id: I336264b084875c04650ceb0cbda8db5319c6bf4d Signed-off-by: Wootak Jung --- src/tapi_call.c | 24 ++++++++++++++---------- src/tapi_common.c | 6 ++++-- src/tapi_network.c | 20 ++++++++++++-------- src/tapi_oem.c | 12 ++++++++---- src/tapi_phonebook.c | 6 ++++-- src/tapi_sat.c | 24 ++++++++++++++++-------- src/tapi_sms.c | 6 ++++-- 7 files changed, 62 insertions(+), 36 deletions(-) diff --git a/src/tapi_call.c b/src/tapi_call.c index b82c77a..de30128 100644 --- a/src/tapi_call.c +++ b/src/tapi_call.c @@ -880,12 +880,14 @@ EXPORT_API int tel_get_call_status_all(TapiHandle *handle, TelCallStatusCallback if (gerr) g_error_free(gerr); } else { - if (strstr(gerr->message, "AccessDenied")) { - err("Permission denied"); - return TAPI_API_ACCESS_DENIED; - } else { - err("[error] fail to get call status (%s)", gerr->message); - return TAPI_API_OPERATION_FAILED; + if (gerr) { + if (strstr(gerr->message, "AccessDenied")) { + err("Permission denied"); + return TAPI_API_ACCESS_DENIED; + } else { + err("[error] fail to get call status (%s)", gerr->message); + return TAPI_API_OPERATION_FAILED; + } } } @@ -1106,10 +1108,12 @@ EXPORT_API int tel_get_call_preferred_voice_subscription(TapiHandle *handle, Tel ret = TAPI_API_SUCCESS; g_variant_unref(sync_gv); } else { - err("Get 'preferred' Voice Subscription failed: [%s]", gerr->message); - if (strstr(gerr->message, "AccessDenied")) - ret = TAPI_API_ACCESS_DENIED; - g_error_free(gerr); + if (gerr) { + err("Get 'preferred' Voice Subscription failed: [%s]", gerr->message); + if (strstr(gerr->message, "AccessDenied")) + ret = TAPI_API_ACCESS_DENIED; + g_error_free(gerr); + } } return ret; diff --git a/src/tapi_common.c b/src/tapi_common.c index 50d136d..62e91a6 100644 --- a/src/tapi_common.c +++ b/src/tapi_common.c @@ -1529,8 +1529,10 @@ EXPORT_API char **tel_get_cp_name_list(void) "org.tizen.telephony.Manager", "GetModems", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, NULL, &error); if (!rst) { - err("GetModems() failed. (%s)", error->message); - g_error_free(error); + if (error) { + err("GetModems() failed. (%s)", error->message); + g_error_free(error); + } goto OUT; } diff --git a/src/tapi_network.c b/src/tapi_network.c index 7b827f6..6cf3b17 100644 --- a/src/tapi_network.c +++ b/src/tapi_network.c @@ -1324,10 +1324,12 @@ EXPORT_API int tel_get_network_default_data_subscription(TapiHandle *handle, Tel g_variant_unref(sync_gv); ret = TAPI_API_SUCCESS; } else { - err("Get Data Subscription failed: [%s]", gerr->message); - if (strstr(gerr->message, "AccessDenied")) - ret = TAPI_API_ACCESS_DENIED; - g_error_free(gerr); + if (gerr) { + err("Get Data Subscription failed: [%s]", gerr->message); + if (strstr(gerr->message, "AccessDenied")) + ret = TAPI_API_ACCESS_DENIED; + g_error_free(gerr); + } } return ret; @@ -1384,10 +1386,12 @@ EXPORT_API int tel_get_network_default_subscription(TapiHandle *handle, TelNetwo g_variant_unref(sync_gv); ret = TAPI_API_SUCCESS; } else { - err("Get 'default' Subscription (for CS) failed: [%s]", gerr->message); - if (strstr(gerr->message, "AccessDenied")) - ret = TAPI_API_ACCESS_DENIED; - g_error_free(gerr); + if (gerr) { + err("Get 'default' Subscription (for CS) failed: [%s]", gerr->message); + if (strstr(gerr->message, "AccessDenied")) + ret = TAPI_API_ACCESS_DENIED; + g_error_free(gerr); + } } return ret; diff --git a/src/tapi_oem.c b/src/tapi_oem.c index b6144ce..05864a6 100644 --- a/src/tapi_oem.c +++ b/src/tapi_oem.c @@ -117,8 +117,10 @@ EXPORT_API int tel_send_oem_data(TapiHandle *handle, int oem_id, TAPI_DEFAULT_TIMEOUT, handle->ca, &error); g_free(encoded_data); if (!rst) { - dbg("error to data(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to data(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } @@ -162,8 +164,10 @@ EXPORT_API int tel_send_oem_data_sync(TapiHandle *handle, int oem_id, g_free(encoded_data); if (!rst) { - dbg("error to data(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to data(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } diff --git a/src/tapi_phonebook.c b/src/tapi_phonebook.c index fe50a83..dcb77b8 100644 --- a/src/tapi_phonebook.c +++ b/src/tapi_phonebook.c @@ -327,8 +327,10 @@ EXPORT_API int tel_get_sim_pb_init_info(TapiHandle *handle, int *init_completed, *init_completed = init_status; g_variant_unref(sync_gv); } else { - err("Operation Failed - Error: (%s)", gerr->message); - g_error_free(gerr); + if (gerr) { + err("Operation Failed - Error: (%s)", gerr->message); + g_error_free(gerr); + } return TAPI_API_OPERATION_FAILED; } diff --git a/src/tapi_sat.c b/src/tapi_sat.c index 20d0d65..2648d66 100644 --- a/src/tapi_sat.c +++ b/src/tapi_sat.c @@ -443,8 +443,10 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf DBUS_TELEPHONY_SAT_INTERFACE, "GetMainMenuInfo", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error); if (!rst) { - dbg("error to get main menu(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to get main menu(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } @@ -531,8 +533,10 @@ EXPORT_API int tel_send_sat_ui_display_status(TapiHandle *handle, int commandId, DBUS_TELEPHONY_SAT_INTERFACE, "SendUiDisplayStatus", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error); if (!rst) { - dbg("error to send ui display status(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to send ui display status(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } @@ -607,8 +611,10 @@ EXPORT_API int tel_send_sat_ui_user_confirm(TapiHandle *handle, TelSatUiUserConf DBUS_TELEPHONY_SAT_INTERFACE, "SendUserConfirm", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error); if (!rst) { - dbg("error to send ui user confirm(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to send ui user confirm(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } @@ -668,8 +674,10 @@ EXPORT_API int tel_send_sat_app_exec_result(TapiHandle *handle, TelSatAppsRetInf DBUS_TELEPHONY_SAT_INTERFACE, "SendAppExecResult", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error); if (!rst) { - dbg("error to send app execution result(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to send app execution result(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } diff --git a/src/tapi_sms.c b/src/tapi_sms.c index b446720..012008a 100644 --- a/src/tapi_sms.c +++ b/src/tapi_sms.c @@ -970,8 +970,10 @@ EXPORT_API int tel_check_sms_device_status(struct tapi_handle *handle, int *pRea "GetSmsReadyStatus", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, NULL, &error); if (!smsReady) { - dbg("error to get SMS ready_status(%s)", error->message); - g_error_free(error); + if (error) { + dbg("error to get SMS ready_status(%s)", error->message); + g_error_free(error); + } return TAPI_API_OPERATION_FAILED; } -- 2.7.4