Fix coverity issue

Change-Id: I8f33d0f7e6064c55e51e8b948656704082b563af
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/src/telephony_modem.c b/src/telephony_modem.c
index 04913fea71c101e251ea206f2e4545b830f1ce7c..39c3197e78ccfbb14b819be8473c494f12246c90 100644 (file)
--- a/src/telephony_modem.c
+++ b/src/telephony_modem.c
@@ -61,20 +61,22 @@ API int telephony_modem_get_imei(telephony_h handle, char **imei)
                g_variant_unref(gv);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_conn failed. error (%s)", gerr->message);
-               if (strstr(gerr->message, "AccessDenied")) {
-                       if (telephony_check_legacy_telephony_privilege()) {
-                               DBG("return pseudo value");
-                               *imei = strdup("000000000000000");
+               if (gerr) {
+                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                       if (strstr(gerr->message, "AccessDenied")) {
+                               if (telephony_check_legacy_telephony_privilege()) {
+                                       DBG("return pseudo value");
+                                       *imei = strdup("000000000000000");
+                               } else {
+                                       ERR("PERMISSION_DENIED");
+                                       error = TELEPHONY_ERROR_PERMISSION_DENIED;
+                               }
                        } else {
-                               ERR("PERMISSION_DENIED");
-                               error = TELEPHONY_ERROR_PERMISSION_DENIED;
+                               ERR("OPERATION_FAILED");
+                               error = TELEPHONY_ERROR_OPERATION_FAILED;
                        }
-               } else {
-                       ERR("OPERATION_FAILED");
-                       error = TELEPHONY_ERROR_OPERATION_FAILED;
+                       g_error_free(gerr);
                }
-               g_error_free(gerr);
        }
 
        return error;
@@ -170,20 +172,22 @@ API int telephony_modem_get_meid(telephony_h handle, char **meid)
                }
                g_variant_unref(gv);
        } else {
-               ERR("g_dbus_conn failed. error (%s)", gerr->message);
-               if (strstr(gerr->message, "AccessDenied")) {
-                       if (telephony_check_legacy_telephony_privilege()) {
-                               DBG("return pseudo value");
-                               *meid = strdup("000000000000000");
+               if (gerr) {
+                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                       if (strstr(gerr->message, "AccessDenied")) {
+                               if (telephony_check_legacy_telephony_privilege()) {
+                                       DBG("return pseudo value");
+                                       *meid = strdup("000000000000000");
+                               } else {
+                                       ERR("PERMISSION_DENIED");
+                                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                               }
                        } else {
-                               ERR("PERMISSION_DENIED");
-                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
                        }
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       g_error_free(gerr);
                }
-               g_error_free(gerr);
        }
 
        return ret;

diff --git a/src/telephony_network.c b/src/telephony_network.c
index 130f2f747c68bb8904237ae4d7bc1f216d8e6583..0bd7b68ed7054bd10232ef7bf05d7d0b9434e4c9 100644 (file)
--- a/src/telephony_network.c
+++ b/src/telephony_network.c
@@ -50,15 +50,17 @@ API int telephony_network_get_lac(telephony_h handle, int *lac)
                g_variant_unref(dbus_result);
        /* LCOV_EXCL_START */
        } else {
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
        }
        /* LCOV_EXCL_STOP */
 
@@ -87,15 +89,17 @@ API int telephony_network_get_cell_id(telephony_h handle, int *cell_id)
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -604,12 +608,14 @@ API int telephony_network_get_selection_mode(telephony_h handle, telephony_netwo
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -638,15 +644,17 @@ API int telephony_network_get_tac(telephony_h handle, int *tac)
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -675,15 +683,17 @@ API int telephony_network_get_system_id(telephony_h handle, int *sid)
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -712,15 +722,17 @@ API int telephony_network_get_network_id(telephony_h handle, int *nid)
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -749,15 +761,17 @@ API int telephony_network_get_base_station_id(telephony_h handle, int *bs_id)
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -786,15 +800,17 @@ API int telephony_network_get_base_station_latitude(telephony_h handle, int *bs_
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 
@@ -823,15 +839,17 @@ API int telephony_network_get_base_station_longitude(telephony_h handle, int *bs
                g_variant_unref(dbus_result);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
-               if (strstr(error->message, "AccessDenied")) {
-                       ERR("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       ERR("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               if (error) {
+                       ERR("g_dbus_connection_call_sync() failed. (%s)", error->message);
+                       if (strstr(error->message, "AccessDenied")) {
+                               ERR("PERMISSION_DENIED");
+                               ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+                       } else {
+                               ERR("OPERATION_FAILED");
+                               ret = TELEPHONY_ERROR_OPERATION_FAILED;
+                       }
+                       g_error_free(error);
                }
-               g_error_free(error);
                /* LCOV_EXCL_STOP */
        }
 

diff --git a/src/telephony_sim.c b/src/telephony_sim.c
index 1a0bfefb6b193808c917022dd621217ddbacf6b0..142eddcffe702e426ef3fa4b81fc7a04f1472c91 100644 (file)
--- a/src/telephony_sim.c
+++ b/src/telephony_sim.c
@@ -120,18 +120,20 @@ API int telephony_sim_get_icc_id(telephony_h handle, char **icc_id)
                g_free(iccid);
                g_variant_unref(sync_gv);
        } else {
-               ERR("g_dbus_conn failed. error (%s)", gerr->message);
-               error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
-               if (error_code == TELEPHONY_ERROR_PERMISSION_DENIED) {
-                       if (telephony_check_legacy_telephony_privilege()) {
-                               DBG("return pseudo value");
-                               *icc_id = strdup("0000000000000000000");
-                               error_code = TELEPHONY_ERROR_NONE;
-                       } else {
-                               ERR("PERMISSION_DENIED");
+               if (gerr) {
+                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                       error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
+                       if (error_code == TELEPHONY_ERROR_PERMISSION_DENIED) {
+                               if (telephony_check_legacy_telephony_privilege()) {
+                                       DBG("return pseudo value");
+                                       *icc_id = strdup("0000000000000000000");
+                                       error_code = TELEPHONY_ERROR_NONE;
+                               } else {
+                                       ERR("PERMISSION_DENIED");
+                               }
                        }
+                       g_error_free(gerr);
                }
-               g_error_free(gerr);
        }
 
        return error_code;
@@ -266,9 +268,11 @@ API int telephony_sim_get_spn(telephony_h handle, char **spn)
                        g_variant_unref(sync_gv);
                } else {
                        /* LCOV_EXCL_START */
-                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
-                       error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
-                       g_error_free(gerr);
+                       if (gerr) {
+                               ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                               error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
+                               g_error_free(gerr);
+                       }
                        /* LCOV_EXCL_STOP */
                }
        }
@@ -440,9 +444,11 @@ API int telephony_sim_get_subscriber_number(telephony_h handle, char **subscribe
                g_variant_unref(sync_gv);
        } else {
                /* LCOV_EXCL_START */
-               ERR("g_dbus_conn failed. error (%s)", gerr->message);
-               error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
-               g_error_free(gerr);
+               if (gerr) {
+                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                       error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
+                       g_error_free(gerr);
+               }
                /* LCOV_EXCL_STOP */
        }
 
@@ -595,9 +601,11 @@ API int telephony_sim_get_group_id1(telephony_h handle, char **gid1)
                        g_variant_unref(sync_gv);
                } else {
                        /* LCOV_EXCL_START */
-                       ERR("g_dbus_conn failed. error (%s)", gerr->message);
-                       error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
-                       g_error_free(gerr);
+                       if (gerr) {
+                               ERR("g_dbus_conn failed. error (%s)", gerr->message);
+                               error_code = _convert_dbus_errmsg_to_sim_error(gerr->message);
+                               g_error_free(gerr);
+                       }
                        /* LCOV_EXCL_STOP */
                }
        }