Fix Svace issues WGID 183392 183809 183815

Change-Id: Ib31207e343066a780a1b7fac8dc335b16a81bd4a
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
index e43c161..3cf39bb 100644 (file)
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -33,8 +33,8 @@
 #define IP2STR(a) (a)[0], (a)[1], (a)[2], (a)[3]
 #define IPSTR "%d.%d.%d.%d"
 #define ZEROIP "0.0.0.0"
-#define ISZEROIP(a) !(a[0] | a[1] | a[2] | a[3])
-#define ISZEROMACADDR(a) !(a[0] | a[1] | a[2] | a[3] | a[4] | a[5])
+#define ISZEROIP(a) !((a)[0] | (a)[1] | (a)[2] | (a)[3])
+#define ISZEROMACADDR(a) !((a)[0] | (a)[1] | (a)[2] | (a)[3] | (a)[4] | (a)[5])
 #define MAC2SECSTR(a) (a)[0], (a)[4], (a)[5]
 #define MACSECSTR "%02x:%02x:%02x"
 #define IP2SECSTR(a) (a)[0], (a)[3]

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 441ed83..c4aa6ed 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.218
+Version:       1.2.219
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 63b6be7..019a73d 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1024,7 +1024,7 @@ void wfd_event_invitation_req(wfd_oem_event_s *event)
        memcpy(peer->intf_addr, edata->bssid, MACADDR_LEN);
        wfd_update_peer_time(manager, event->dev_addr);
 
-       if (edata->go_dev_addr)
+       if (!ISZEROMACADDR(edata->go_dev_addr))
                session = wfd_create_session(manager, edata->go_dev_addr,
                                             manager->req_wps_mode,
                                             SESSION_DIRECTION_INCOMING);
@@ -1050,7 +1050,7 @@ void wfd_event_invitation_req(wfd_oem_event_s *event)
                return;
        }
 
-       if (edata->go_dev_addr)
+       if (!ISZEROMACADDR(edata->go_dev_addr))
                g_snprintf(peer_mac_address, MACSTR_LEN, MACSTR,
                           MAC2STR(edata->go_dev_addr));
        else