projects / platform / core / api / nfc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 682a93d)
Fix coverity issues 55/260055/1 accepted/tizen/unified/20210621.123053 submit/tizen/20210618.083338 submit/tizen/20210620.232512
authorJihoon Jung <jh8801.jung@samsung.com>
Fri, 18 Jun 2021 04:42:22 +0000 (13:42 +0900)
committerJihoon Jung <jh8801.jung@samsung.com>
Fri, 18 Jun 2021 04:42:40 +0000 (13:42 +0900)
Change-Id: Id475d96258da62b965f6bf7ddec4f4cb2e35902b
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
14 files changed:
src/net_nfc_client_handover.c patch | blob | history
src/net_nfc_client_hce.c patch | blob | history
src/net_nfc_client_hce_ipc.c patch | blob | history
src/net_nfc_client_llcp.c patch | blob | history
src/net_nfc_client_manager.c patch | blob | history
src/net_nfc_client_ndef.c patch | blob | history
src/net_nfc_client_ndef_message.c patch | blob | history
src/net_nfc_client_p2p.c patch | blob | history
src/net_nfc_client_se.c patch | blob | history
src/net_nfc_client_snep.c patch | blob | history
src/net_nfc_client_system_handler.c patch | blob | history
src/net_nfc_client_tag.c patch | blob | history
src/net_nfc_client_test.c patch | blob | history
src/net_nfc_client_transceive.c patch | blob | history

diff --git a/src/net_nfc_client_handover.c b/src/net_nfc_client_handover.c
index 9f301f9..aa80b67 100755 (executable)
--- a/src/net_nfc_client_handover.c
+++ b/src/net_nfc_client_handover.c
@@ -115,11 +115,12 @@ static void p2p_connection_handover(GObject *source_object,
                                                &data,
                                                res,
                                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish"
-                        " connection handover: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish connection handover: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -269,10 +270,12 @@ net_nfc_error_e net_nfc_client_p2p_connection_handover_sync(
                if (out_ac_data)
                        *out_ac_data = net_nfc_util_gdbus_variant_to_data(out_data);
        } else {
-               DEBUG_ERR_MSG("handover (sync call) failed: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("handover (sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -324,8 +327,10 @@ net_nfc_error_e net_nfc_client_handover_init(void)
                                        NULL,
                                        &error);
        if (handover_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_hce.c b/src/net_nfc_client_hce.c
index 0cdc55d..aca6a7e 100755 (executable)
--- a/src/net_nfc_client_hce.c
+++ b/src/net_nfc_client_hce.c
@@ -121,8 +121,10 @@ net_nfc_error_e net_nfc_client_hce_set_event_received_cb(
                        }
                }
        } else {
-               DEBUG_ERR_MSG("net_nfc_gdbus_hce_call_start_hce_handler_sync failed: %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_hce_call_start_hce_handler_sync failed: %s", error->message);
+                       g_error_free(error);
+               }
 
                result = NET_NFC_IPC_FAIL;
        }
@@ -149,8 +151,10 @@ net_nfc_error_e net_nfc_client_hce_unset_event_received_cb(void)
 
                net_nfc_client_hce_ipc_deinit();
        } else {
-               DEBUG_ERR_MSG("net_nfc_gdbus_hce_call_stop_hce_handler_sync failed: %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_hce_call_stop_hce_handler_sync failed: %s", error->message);
+                       g_error_free(error);
+               }
 
                result = NET_NFC_IPC_FAIL;
        }
@@ -260,9 +264,10 @@ net_nfc_error_e net_nfc_client_hce_init(void)
                                &error);
 
        if (hce_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_hce_ipc.c b/src/net_nfc_client_hce_ipc.c
index b826227..d1b81d7 100755 (executable)
--- a/src/net_nfc_client_hce_ipc.c
+++ b/src/net_nfc_client_hce_ipc.c
@@ -112,7 +112,7 @@ static bool __receive_data_from_server(int socket, data_s *data)
 
 static bool __process_server_message()
 {
-       bool result;
+       bool result = false;
        data_s data;
 
        if (__receive_data_from_server(hce_client_socket, &data) == true) {
@@ -154,7 +154,7 @@ static bool __send_data_to_server(int socket, data_s *data)
 bool net_nfc_server_hce_ipc_send_to_server(int type,
        net_nfc_target_handle_s *handle, data_s *data)
 {
-       bool ret;
+       bool ret = false;
        data_s temp;
        uint32_t len = sizeof(net_nfc_hce_data_t);
 
diff --git a/src/net_nfc_client_llcp.c b/src/net_nfc_client_llcp.c
index 7aa3214..4eded74 100755 (executable)
--- a/src/net_nfc_client_llcp.c
+++ b/src/net_nfc_client_llcp.c
@@ -170,11 +170,12 @@ static void llcp_call_config(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish config: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish config: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -206,11 +207,12 @@ static void llcp_call_listen(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish listen: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish listen: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        socket_data = llcp_socket_data_find(out_client_socket);
@@ -247,11 +249,12 @@ static void llcp_call_accept(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish accept: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish accept: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -279,11 +282,12 @@ static void llcp_call_reject(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish reject: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish reject: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -315,10 +319,12 @@ static void llcp_call_connect(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish connect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish connect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        socket_data = llcp_socket_data_find(out_client_socket);
@@ -359,10 +365,12 @@ static void llcp_call_connect_sap(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish connect sap: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish connect sap: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        socket_data = llcp_socket_data_find(out_client_socket);
@@ -401,11 +409,12 @@ static void llcp_call_send(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish send: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish send: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -435,10 +444,12 @@ static void llcp_call_send_to(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish send to: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish send to: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -468,10 +479,12 @@ static void llcp_call_receive(GObject *source_object,
                &variant,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish receive: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish receive: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -508,11 +521,12 @@ static void llcp_call_receive_from(GObject *source_object,
                &variant,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish receive from: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish receive from: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -549,10 +563,12 @@ static void llcp_call_close(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish close: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish close: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        socket_data = llcp_socket_data_find(out_client_socket);
@@ -590,10 +606,12 @@ static void llcp_call_disconnect(GObject *source_object,
                &out_client_socket,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish disconnect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish disconnect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        socket_data = llcp_socket_data_find(out_client_socket);
@@ -712,10 +730,12 @@ net_nfc_error_e net_nfc_client_llcp_config_sync
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("can not config: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not config: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -854,10 +874,12 @@ net_nfc_error_e net_nfc_client_llcp_listen_sync(net_nfc_llcp_socket_t socket,
                if (out_socket)
                        *out_socket = out_client_socket;
        } else {
-               DEBUG_ERR_MSG("can not listen: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not listen: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -924,10 +946,12 @@ net_nfc_error_e net_nfc_client_llcp_accept_sync(net_nfc_llcp_socket_t socket)
                &result,
                NULL,
                &error) == false) {
-               DEBUG_ERR_MSG("can not connect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not connect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -994,10 +1018,12 @@ net_nfc_error_e net_nfc_client_llcp_reject_sync(net_nfc_llcp_socket_t socket)
                &result,
                NULL,
                &error) == false) {
-               DEBUG_ERR_MSG("can not connect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not connect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1110,10 +1136,12 @@ net_nfc_error_e net_nfc_client_llcp_connect_sync(net_nfc_llcp_socket_t socket,
                if (out_socket)
                        *out_socket = out_client_socket;
        } else {
-               DEBUG_ERR_MSG("can not connect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not connect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1230,10 +1258,12 @@ net_nfc_error_e net_nfc_client_llcp_connect_sap_sync(
                if (out_socket)
                        *out_socket = out_client_socket;
        } else {
-               DEBUG_ERR_MSG("can not connect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not connect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1346,10 +1376,12 @@ net_nfc_error_e net_nfc_client_llcp_send_sync(net_nfc_llcp_socket_t socket,
                        return NET_NFC_UNKNOWN_ERROR;
                }
        } else {
-               DEBUG_ERR_MSG("can not call send: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call send: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1467,10 +1499,12 @@ net_nfc_error_e net_nfc_client_llcp_send_to_sync(net_nfc_llcp_socket_t socket,
                        return NET_NFC_UNKNOWN_ERROR;
                }
        } else {
-               DEBUG_ERR_MSG("can not call send to: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call send to: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1571,10 +1605,12 @@ net_nfc_error_e net_nfc_client_llcp_receive_sync(net_nfc_llcp_socket_t socket,
                &error) == true) {
                *out_data = net_nfc_util_gdbus_variant_to_data(variant);
        } else {
-               DEBUG_ERR_MSG("can not call receive: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call receive: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1678,10 +1714,12 @@ net_nfc_error_e net_nfc_client_llcp_receive_from_sync(
                *out_sap = sap;
                *out_data = net_nfc_util_gdbus_variant_to_data(variant);
        } else {
-               DEBUG_ERR_MSG("can not call receive from: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call receive from: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1778,10 +1816,12 @@ net_nfc_error_e net_nfc_client_llcp_close_sync(net_nfc_llcp_socket_t socket)
                        return NET_NFC_UNKNOWN_ERROR;
                }
        } else {
-               DEBUG_ERR_MSG("can not close: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not close: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1879,10 +1919,12 @@ net_nfc_error_e net_nfc_client_llcp_disconnect_sync(
                        return NET_NFC_UNKNOWN_ERROR;
                }
        } else {
-               DEBUG_ERR_MSG("can not disconnect: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not disconnect: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -2286,9 +2328,10 @@ net_nfc_error_e net_nfc_client_llcp_init(void)
                        NULL,
                        &error);
        if (llcp_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_manager.c b/src/net_nfc_client_manager.c
index acef38b..67ee9fc 100755 (executable)
--- a/src/net_nfc_client_manager.c
+++ b/src/net_nfc_client_manager.c
@@ -95,11 +95,12 @@ static void manager_call_set_active_callback(GObject *source_object,
                                &result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish call_set_active: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish call_set_active: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        func_data->result = result;
@@ -134,11 +135,12 @@ static void manager_call_get_server_state_callback(GObject *source_object,
                                &out_state,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish get_server_state: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish get_server_state: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -236,8 +238,10 @@ net_nfc_error_e net_nfc_client_manager_set_active(int state,
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -281,8 +285,10 @@ net_nfc_error_e net_nfc_client_manager_set_active_sync(int state)
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -295,11 +301,12 @@ net_nfc_error_e net_nfc_client_manager_set_active_sync(int state)
                &out_result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SetActive: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SetActive: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -361,11 +368,12 @@ net_nfc_error_e net_nfc_client_manager_get_server_state_sync(
                                        &error) == TRUE) {
                *state = out_state;
        } else {
-               DEBUG_ERR_MSG("can not call GetServerState: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call GetServerState: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -391,8 +399,10 @@ net_nfc_error_e net_nfc_client_manager_configure_discovery_sync(int mode)
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -403,11 +413,12 @@ net_nfc_error_e net_nfc_client_manager_configure_discovery_sync(int mode)
                                        &out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call ConfigureDiscovery : %s", error->message);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call ConfigureDiscovery : %s", error->message);
+                       g_error_free(error);
+               }
 
                out_result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
        }
 
        return out_result;
@@ -431,8 +442,10 @@ net_nfc_error_e net_nfc_client_manager_init(void)
                NULL,
                &error);
        if (manager_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_ndef.c b/src/net_nfc_client_ndef.c
index 973adbd..150b2e1 100755 (executable)
--- a/src/net_nfc_client_ndef.c
+++ b/src/net_nfc_client_ndef.c
@@ -98,10 +98,12 @@ static void ndef_call_read(GObject *source_object,
                                &out_data,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish read: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish read: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -134,10 +136,12 @@ static void ndef_call_write(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish write: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish write: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -165,11 +169,12 @@ static void ndef_call_make_read_only(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish make read only: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish make read only: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -197,10 +202,12 @@ static void ndef_call_format(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish format: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish format: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -290,11 +297,12 @@ net_nfc_error_e net_nfc_client_ndef_read_sync(net_nfc_target_handle_h handle,
                                        &error) == TRUE) {
                *message = net_nfc_util_gdbus_variant_to_ndef_message(out_data);
        } else {
-               DEBUG_ERR_MSG("can not call read: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call read: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -378,11 +386,12 @@ net_nfc_error_e net_nfc_client_ndef_write_sync(net_nfc_target_handle_h handle,
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call write: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call write: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -464,11 +473,12 @@ net_nfc_error_e net_nfc_client_ndef_make_read_only_sync(
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not make read only: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not make read only: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -553,11 +563,12 @@ net_nfc_error_e net_nfc_client_ndef_format_sync(
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call format: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call format: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -581,8 +592,10 @@ net_nfc_error_e net_nfc_client_ndef_init(void)
                                NULL,
                                &error);
        if (ndef_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_ndef_message.c b/src/net_nfc_client_ndef_message.c
index db3705e..5d80f23 100755 (executable)
--- a/src/net_nfc_client_ndef_message.c
+++ b/src/net_nfc_client_ndef_message.c
@@ -85,7 +85,7 @@ NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_create_ndef_message_from_rawdata(
        ndef_message_h *ndef_message, data_h rawdata)
 {
-       net_nfc_error_e result;
+       net_nfc_error_e result = NET_NFC_OK;
        ndef_message_h msg;
 
        if (ndef_message == NULL || rawdata == NULL)
diff --git a/src/net_nfc_client_p2p.c b/src/net_nfc_client_p2p.c
index 11cb902..92a60ab 100755 (executable)
--- a/src/net_nfc_client_p2p.c
+++ b/src/net_nfc_client_p2p.c
@@ -127,10 +127,12 @@ static void p2p_call_send(GObject *source_object,
                (gint *)&out_result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish p2p send: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish p2p send: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -212,11 +214,12 @@ net_nfc_error_e net_nfc_client_p2p_send_sync(net_nfc_target_handle_h handle,
                (gint *)&out_result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("p2p send (sync call) failed: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("p2p send (sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -327,8 +330,10 @@ net_nfc_error_e net_nfc_client_p2p_init(void)
                NULL,
                &error);
        if (p2p_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_se.c b/src/net_nfc_client_se.c
index 50d5b01..94b5aad 100755 (executable)
--- a/src/net_nfc_client_se.c
+++ b/src/net_nfc_client_se.c
@@ -182,8 +182,10 @@ static void se_transaction_event(GObject *source_object,
                &result,
                NULL,
                &error) == false) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_check_transaction_permission_sync failed : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_check_transaction_permission_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
                return;
        }
 
@@ -254,12 +256,12 @@ static void set_secure_element(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Could not set secure element: %s", error->message);
+                       g_error_free(error);
+               }
 
-               DEBUG_ERR_MSG("Could not set secure element: %s",
-                               error->message);
                result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
        }
 
        if (func_data->se_callback != NULL) {
@@ -289,12 +291,12 @@ static void open_secure_element(GObject *source_object,
                &out_handle,
                res,
                &error) == FALSE) {
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Could not open secure element: %s", error->message);
+                       g_error_free(error);
+               }
 
-               DEBUG_ERR_MSG("Could not open secure element: %s",
-                               error->message);
                result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
        }
 
        if (func_data->se_callback != NULL) {
@@ -325,10 +327,12 @@ static void close_secure_element(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Could not close secure element: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Could not close secure element: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->se_callback != NULL) {
@@ -359,10 +363,12 @@ static void send_apdu_secure_element(GObject *source_object,
                &out_response,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Could not send apdu: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Could not send apdu: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->se_callback != NULL) {
@@ -398,10 +404,12 @@ static void get_atr_secure_element(GObject *source_object,
                &out_atr,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Could not get atr: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Could not get atr: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->se_callback != NULL) {
@@ -482,10 +490,12 @@ net_nfc_error_e net_nfc_client_se_set_secure_element_type_sync(
                        &result,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("Set secure element failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Set secure element failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -526,9 +536,10 @@ net_nfc_error_e net_nfc_client_se_get_secure_element_type_sync(
                SECURE_MSG("type [%d]", type);
                *se_type = type;
        } else {
-               DEBUG_ERR_MSG("get secure element failed: %s", error->message);
-
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("get secure element failed: %s", error->message);
+                       g_error_free(error);
+               }
 
                result = NET_NFC_IPC_FAIL;
        }
@@ -560,10 +571,12 @@ net_nfc_error_e net_nfc_set_card_emulation_mode_sync(
                        &result,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("Set card emulation failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Set card emulation failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -596,9 +609,10 @@ net_nfc_error_e net_nfc_get_card_emulation_mode_sync(
                        &error) == true) {
                *se_type = type;
        } else {
-               DEBUG_ERR_MSG("get secure element failed: %s", error->message);
-
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("get secure element failed: %s", error->message);
+                       g_error_free(error);
+               }
 
                result = NET_NFC_IPC_FAIL;
        }
@@ -625,8 +639,10 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -675,8 +691,10 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -693,9 +711,10 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element_sync(
                                        &error) == true) {
                *handle = GUINT_TO_POINTER(out_handle);
        } else {
-               DEBUG_ERR_MSG("Open internal secure element failed: %s",
-                                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Open internal secure element failed: %s", error->message);
+                       result = NET_NFC_IPC_FAIL;
+               }
 
                g_error_free(error);
        }
@@ -723,8 +742,10 @@ net_nfc_error_e net_nfc_client_se_close_internal_secure_element(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -768,8 +789,10 @@ net_nfc_error_e net_nfc_client_se_close_internal_secure_element_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -783,11 +806,12 @@ net_nfc_error_e net_nfc_client_se_close_internal_secure_element_sync(
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("close internal secure element failed: %s",
-                                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("close internal secure element failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -813,8 +837,10 @@ net_nfc_error_e net_nfc_client_se_get_atr(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -865,8 +891,10 @@ net_nfc_error_e net_nfc_client_se_get_atr_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -883,10 +911,12 @@ net_nfc_error_e net_nfc_client_se_get_atr_sync(
                &error) == true) {
                *atr = net_nfc_util_gdbus_variant_to_data(out_atr);
        } else {
-               DEBUG_ERR_MSG("Get attributes failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Get attributes failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -914,8 +944,10 @@ net_nfc_error_e net_nfc_client_se_send_apdu(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -976,8 +1008,10 @@ net_nfc_error_e net_nfc_client_se_send_apdu_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -999,10 +1033,12 @@ net_nfc_error_e net_nfc_client_se_send_apdu_sync(
                &error) == true) {
                *response = net_nfc_util_gdbus_variant_to_data(out_data);
        } else {
-               DEBUG_ERR_MSG("Send APDU failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Send APDU failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1112,8 +1148,10 @@ net_nfc_error_e net_nfc_client_se_set_transaction_fg_dispatch(int mode)
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -1125,11 +1163,12 @@ net_nfc_error_e net_nfc_client_se_set_transaction_fg_dispatch(int mode)
                &result,
                NULL,
                &error) != true) {
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("set transaction fg dispatch failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               DEBUG_ERR_MSG("set transaction fg dispatch failed: %s", error->message);
                result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
        }
 
        return result;
@@ -1161,10 +1200,12 @@ net_nfc_error_e net_nfc_client_se_set_default_route_sync(
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Set Route Aid failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Set Route Aid failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        DEBUG_CLIENT_MSG("net_nfc_gdbus_secure_element_call_set_default_route_sync end");
@@ -1202,10 +1243,12 @@ net_nfc_error_e net_nfc_client_se_is_activated_aid_handler_sync(
                        &error) == true) {
                *activated = ret;
        } else {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_is_activated_aid_handler_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_is_activated_aid_handler_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1242,10 +1285,12 @@ net_nfc_error_e net_nfc_client_se_is_activated_category_handler_sync(
                        &error) == true) {
                *activated = ret;
        } else {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_is_activated_category_handler_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_is_activated_category_handler_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1281,10 +1326,12 @@ net_nfc_error_e net_nfc_client_se_get_registered_aids_count_sync(
                        &aids,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_aids_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_aids_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (result == NET_NFC_OK) {
@@ -1331,10 +1378,12 @@ net_nfc_error_e net_nfc_client_se_foreach_registered_aids_sync(
                        &aids,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_aids_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_aids_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (result == NET_NFC_OK) {
@@ -1376,10 +1425,12 @@ net_nfc_error_e net_nfc_client_se_register_aids_sync(net_nfc_se_type_e se_type,
                        &result,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_register_aid_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_register_aid_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1409,10 +1460,12 @@ net_nfc_error_e net_nfc_client_se_unregister_aid_sync(net_nfc_se_type_e se_type,
                        &result,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_unregister_aid_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_unregister_aid_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1440,10 +1493,12 @@ net_nfc_error_e net_nfc_client_se_unregister_aids_sync(net_nfc_se_type_e se_type
                        &result,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_unregister_aids_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_unregister_aids_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1478,10 +1533,12 @@ net_nfc_error_e net_nfc_client_se_foreach_registered_handlers_sync(
                        &handlers,
                        NULL,
                        &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_handlers_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_registered_handlers_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (result == NET_NFC_OK) {
@@ -1518,8 +1575,10 @@ net_nfc_error_e net_nfc_client_se_add_route_aid_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -1536,10 +1595,12 @@ net_nfc_error_e net_nfc_client_se_add_route_aid_sync(
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Set Route Aid failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Set Route Aid failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        DEBUG_CLIENT_MSG("net_nfc_gdbus_secure_element_call_add_route_aid_sync end");
@@ -1565,8 +1626,10 @@ net_nfc_error_e net_nfc_client_se_remove_route_aid_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -1579,10 +1642,12 @@ net_nfc_error_e net_nfc_client_se_remove_route_aid_sync(
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Remove Route Aid failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Remove Route Aid failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        DEBUG_CLIENT_MSG("net_nfc_gdbus_hce_call_set_route_aid_sync end");
@@ -1608,8 +1673,10 @@ net_nfc_error_e net_nfc_client_se_remove_package_aids_sync(
                        NULL,
                        &error);
                if (auto_start_proxy == NULL) {
-                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
 
                        return NET_NFC_UNKNOWN_ERROR;
                }
@@ -1621,10 +1688,12 @@ net_nfc_error_e net_nfc_client_se_remove_package_aids_sync(
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Remove Package Aid failed: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Remove Package Aid failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        DEBUG_CLIENT_MSG("net_nfc_client_se_remove_package_aids_sync end");
@@ -1652,10 +1721,12 @@ net_nfc_error_e net_nfc_client_se_set_preferred_handler_sync(bool state)
                state,
                &result,
                NULL, &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_set_preferred_handler_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_set_preferred_handler_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1684,10 +1755,12 @@ net_nfc_error_e net_nfc_client_se_get_handler_storage_info_sync(
                used,
                max,
                NULL, &error) == FALSE) {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_handler_storage_info_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_handler_storage_info_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1748,10 +1821,12 @@ net_nfc_error_e net_nfc_client_se_get_conflict_handlers_sync(
                        }
                }
        } else {
-               DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_conflict_handlers_sync failed : %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_secure_element_call_get_conflict_handlers_sync failed : %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -1775,9 +1850,10 @@ net_nfc_error_e net_nfc_client_se_init(void)
                                NULL,
                                &error);
        if (se_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_snep.c b/src/net_nfc_client_snep.c
index aaf8714..d637c84 100755 (executable)
--- a/src/net_nfc_client_snep.c
+++ b/src/net_nfc_client_snep.c
@@ -64,11 +64,12 @@ static void snep_send_client_request(GObject *source_object,
                &out_data,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish send client request %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish send client request %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        g_variant_get(parameter, "(ttt)",
@@ -124,11 +125,12 @@ net_nfc_error_e net_nfc_client_snep_start_server(
                (gint *)&result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("snep server(sync call) failed: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("snep server(sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
 
                g_variant_unref(parameter);
        }
@@ -170,11 +172,12 @@ net_nfc_error_e net_nfc_client_snep_start_client(
                (gint *)&result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("snep client(sync call) failed: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("snep client(sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
 
                g_variant_unref(parameter);
        }
@@ -312,11 +315,12 @@ net_nfc_error_e net_nfc_client_snep_stop_service_sync(
                (gint *)&result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("snep stop service(sync call) failed: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("snep stop service(sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -401,14 +405,16 @@ net_nfc_error_e net_nfc_client_snep_register_server(const char *san,
                (gint *)&result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("snep register server(sync call) failed: %s",
-                       error->message);
-               if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
-                       result = NET_NFC_PERMISSION_DENIED;
-               else
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("snep register server(sync call) failed: %s", error->message);
+                       if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
+                               result = NET_NFC_PERMISSION_DENIED;
+                       else
+                               result = NET_NFC_IPC_FAIL;
+                       g_error_free(error);
+               } else {
                        result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
+               }
 
                g_variant_unref(parameter);
        }
@@ -439,11 +445,12 @@ net_nfc_error_e net_nfc_client_snep_unregister_server(const char *san,
                (gint *)&result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("snep unregister server(sync call) failed: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("snep unregister server(sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -467,8 +474,10 @@ net_nfc_error_e net_nfc_client_snep_init(void)
                NULL,
                &error);
        if (snep_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_system_handler.c b/src/net_nfc_client_system_handler.c
index 8e2996d..a90dd45 100755 (executable)
--- a/src/net_nfc_client_system_handler.c
+++ b/src/net_nfc_client_system_handler.c
@@ -52,11 +52,12 @@ static void popup_set_active_callback(GObject *source_object,
                &result,
                res,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish popup_set_active: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish popup_set_active: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -127,11 +128,12 @@ net_nfc_error_e net_nfc_client_sys_handler_set_state_sync(int state)
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SetActive: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SetActive: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -195,11 +197,12 @@ net_nfc_error_e net_nfc_client_sys_handler_set_state_force_sync(int state)
                &result,
                NULL,
                &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SetActive: %s",
-                       error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SetActive: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -254,12 +257,12 @@ net_nfc_error_e net_nfc_client_sys_handler_get_launch_popup_state(
                &error) == true) {
                *state = out_state;
        } else {
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("net_nfc_gdbus_popup_call_get_sync failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               DEBUG_ERR_MSG("net_nfc_gdbus_popup_call_get_sync failed: %s",
-                               error->message);
                result = NET_NFC_IPC_FAIL;
-
-               g_error_free(error);
        }
 
        return result;
@@ -283,8 +286,10 @@ net_nfc_error_e net_nfc_client_sys_handler_init(void)
                                        NULL,
                                        &error);
        if (popup_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_OPERATION_FAIL;
        }
diff --git a/src/net_nfc_client_tag.c b/src/net_nfc_client_tag.c
index dbe7a01..3991271 100755 (executable)
--- a/src/net_nfc_client_tag.c
+++ b/src/net_nfc_client_tag.c
@@ -481,11 +481,12 @@ net_nfc_error_e net_nfc_client_tag_is_tag_connected_sync(
                                        (gint *)&out_dev_type,
                                        NULL,
                                        &error) == FALSE) {
-                       DEBUG_ERR_MSG("Can not get is_tag_connected result: %s",
-                                       error->message);
-                       result = NET_NFC_IPC_FAIL;
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can not get is_tag_connected result: %s", error->message);
+                               g_error_free(error);
+                       }
 
-                       g_error_free(error);
+                       result = NET_NFC_IPC_FAIL;
 
                        return result;
                }
@@ -530,10 +531,12 @@ net_nfc_error_e net_nfc_client_barcode_get_barcode_sync(
                                &out_barcode,
                                NULL,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can no get barcode result: %s", error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can no get barcode result: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
 
                return result;
        }
@@ -542,9 +545,15 @@ net_nfc_error_e net_nfc_client_barcode_get_barcode_sync(
                data = g_new0(data_s, 1);
                net_nfc_util_gdbus_variant_to_data_s(out_barcode, data);
 
-               if (data == NULL || data->buffer == NULL || data->length == 0)
+               if (data == NULL)
                        return NET_NFC_OPERATION_FAIL;
 
+               if (data->buffer == NULL || data->length == 0) {
+                       net_nfc_util_free_data(data);
+
+                       return NET_NFC_OPERATION_FAIL;
+               }
+
                /* alloc barcode */
                *barcode_len = data->length;
                *barcode = (unsigned char *)calloc(*barcode_len, sizeof(unsigned char));
@@ -597,11 +606,12 @@ net_nfc_error_e net_nfc_client_tag_get_current_tag_info_sync(
                                        &out_raw_data,
                                        NULL,
                                        &error) == FALSE) {
-                       DEBUG_ERR_MSG("Can no get current_tag_info result: %s",
-                                       error->message);
-                       result = NET_NFC_IPC_FAIL;
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can no get current_tag_info result: %s", error->message);
+                               g_error_free(error);
+                       }
 
-                       g_error_free(error);
+                       result = NET_NFC_IPC_FAIL;
 
                        return result;
                }
@@ -668,11 +678,12 @@ net_nfc_error_e net_nfc_client_tag_get_current_target_handle_sync(
                        (gint *)&out_dev_type,
                        NULL,
                        &error) == FALSE) {
-                       DEBUG_ERR_MSG("Can no get current_target_handle result: %s",
-                                       error->message);
-                       result = NET_NFC_IPC_FAIL;
+                       if (error != NULL) {
+                               DEBUG_ERR_MSG("Can no get current_target_handle result: %s", error->message);
+                               g_error_free(error);
+                       }
 
-                       g_error_free(error);
+                       result = NET_NFC_IPC_FAIL;
 
                        return result;
                }
@@ -792,8 +803,10 @@ net_nfc_error_e net_nfc_client_tag_init(void)
                                NULL,
                                &error);
        if (tag_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_test.c b/src/net_nfc_client_test.c
index f5c5cbc..83e5b73 100755 (executable)
--- a/src/net_nfc_client_test.c
+++ b/src/net_nfc_client_test.c
@@ -66,11 +66,12 @@ static void test_call_sim_test_callback(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish sim_test: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish sim_test: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -98,11 +99,12 @@ static void test_call_prbs_test_callback(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish prbs test: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish prbs test: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -132,11 +134,12 @@ static void test_call_get_firmware_version_callback(GObject *source_object,
                                &out_version,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish get_firmware_version: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish get_firmware_version: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -165,11 +168,12 @@ static void test_call_set_ee_data_callback(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish set_ee_data: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish set_ee_data: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -197,11 +201,12 @@ static void test_call_ese_test_callback(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish sim_test: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish sim_test: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (func_data->callback != NULL) {
@@ -269,11 +274,12 @@ net_nfc_error_e net_nfc_client_test_sim_test_sync(void)
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SimTest: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SimTest: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -339,11 +345,12 @@ net_nfc_error_e net_nfc_client_test_prbs_test_sync(uint32_t tech,
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call PrbsTest: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call PrbsTest: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -412,11 +419,12 @@ net_nfc_error_e net_nfc_client_test_get_firmware_version_sync(char **version)
                                        &error) == TRUE) {
                *version = out_version;
        } else {
-               DEBUG_ERR_MSG("can not call Get Firmware version: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call Get Firmware version: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -492,11 +500,12 @@ net_nfc_error_e net_nfc_client_test_set_ee_data_sync(int mode,
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SetEeTest: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SetEeTest: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -560,11 +569,12 @@ net_nfc_error_e net_nfc_client_test_ese_test_sync(void)
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call ESE Test: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call ESE Test: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -594,11 +604,12 @@ net_nfc_error_e net_nfc_client_test_set_se_tech_type_sync(
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call SetSeTechType: %s",
-                               error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call SetSeTechType: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -628,11 +639,12 @@ net_nfc_error_e net_nfc_client_test_set_listen_tech_mask_sync(uint32_t tech)
                                        &result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("can not call listen tech mask: %s",
-                               error->message);
-               result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("can not call listen tech mask: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               result = NET_NFC_IPC_FAIL;
        }
 
        return result;
@@ -657,8 +669,10 @@ net_nfc_error_e net_nfc_client_test_init(void)
                                        NULL,
                                        &error);
        if (test_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
diff --git a/src/net_nfc_client_transceive.c b/src/net_nfc_client_transceive.c
index 6953ab9..db80caf 100755 (executable)
--- a/src/net_nfc_client_transceive.c
+++ b/src/net_nfc_client_transceive.c
@@ -129,8 +129,10 @@ static void transceive_data_call(GObject *source_object,
                                &out_data,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish transceive: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish transceive: %s", error->message);
+                       out_result = NET_NFC_IPC_FAIL;
+               }
 
                g_error_free(error);
        }
@@ -166,8 +168,10 @@ static void transceive_call(GObject *source_object,
                                (gint *)&out_result,
                                res,
                                &error) == FALSE) {
-               DEBUG_ERR_MSG("Can not finish transceive: %s", error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not finish transceive: %s", error->message);
+                       out_result = NET_NFC_IPC_FAIL;
+               }
 
                g_error_free(error);
        }
@@ -334,11 +338,12 @@ net_nfc_error_e net_nfc_client_transceive_sync(net_nfc_target_handle_h handle,
                                        (gint *)&out_result,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("Transceive (sync call) failed: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Transceive (sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        return out_result;
@@ -390,11 +395,12 @@ net_nfc_error_e net_nfc_client_transceive_data_sync(
                                        &out_data,
                                        NULL,
                                        &error) == FALSE) {
-               DEBUG_ERR_MSG("Transceive (sync call) failed: %s",
-                       error->message);
-               out_result = NET_NFC_IPC_FAIL;
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Transceive (sync call) failed: %s", error->message);
+                       g_error_free(error);
+               }
 
-               g_error_free(error);
+               out_result = NET_NFC_IPC_FAIL;
        }
 
        if (response && out_data != NULL)
@@ -422,8 +428,10 @@ net_nfc_error_e net_nfc_client_transceive_init(void)
                                        NULL,
                                        &error);
        if (transceive_proxy == NULL) {
-               DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
-               g_error_free(error);
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("Can not create proxy : %s", error->message);
+                       g_error_free(error);
+               }
 
                return NET_NFC_UNKNOWN_ERROR;
        }
Domain: Network & Connectivity / NFC;