NFC Bug fixes

Improper handling of function return value in LLCP server
Wrong data handling in GDBUS helper function

Change-Id: Ib6dc5ef8987cc112f527fd0bc71ae7fe7dd87e69
Signed-off-by:Abhijit R D<abhijit.rd@samsung.com>

diff --git a/common/net_nfc_util_gdbus.c b/common/net_nfc_util_gdbus.c
index bc8275ec6be13a225c4e48ea2820c31f2bedaff8..c375dc30996a6e3f5be960b140d48b54751df641 100644 (file)
--- a/common/net_nfc_util_gdbus.c
+++ b/common/net_nfc_util_gdbus.c
@@ -146,7 +146,7 @@ GVariant *net_nfc_util_gdbus_buffer_to_variant(const uint8_t *buffer,
 
        g_variant_builder_init(&builder, G_VARIANT_TYPE("a(y)"));
 
-       if (NULL == buffer || length <= 0)
+       if (buffer && length > 0)
        {
                int i;
 

diff --git a/daemon/net_nfc_server_llcp.c b/daemon/net_nfc_server_llcp.c
index b5f407204d6c61a2dc578bf3beda66bc53efae83..330f76f35fee75afc5aad57d6728884f6035f9b1 100644 (file)
--- a/daemon/net_nfc_server_llcp.c
+++ b/daemon/net_nfc_server_llcp.c
@@ -1467,7 +1467,7 @@ static gboolean llcp_handle_receive_from(NetNfcGDbusLlcp *llcp,
 
        NFC_INFO(">>> REQUEST from [%s]", g_dbus_method_invocation_get_sender(invocation));
 
-       ret == net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
+       ret = net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
                                "nfc-manager::p2p", "w");
 
        /* check privilege and update client context */
@@ -1523,7 +1523,7 @@ static gboolean llcp_handle_close(NetNfcGDbusLlcp *llcp,
 
        NFC_INFO(">>> REQUEST from [%s]", g_dbus_method_invocation_get_sender(invocation));
 
-       ret == net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
+       ret = net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
                                "nfc-manager::p2p", "w");
        /* check privilege and update client context */
        if (false == ret)
@@ -1578,7 +1578,7 @@ static gboolean llcp_handle_disconnect(NetNfcGDbusLlcp *llcp,
 
        NFC_INFO(">>> REQUEST from [%s]", g_dbus_method_invocation_get_sender(invocation));
 
-       ret == net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
+       ret = net_nfc_server_gdbus_check_privilege(invocation, smack_privilege,
                                "nfc-manager::p2p", "w");
        /* check privilege and update client context */
        if (false == ret)