Fix Svace issues WGID 143860, 143861, 143862, 143863

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

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index fbb8b59..f98275b 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -2,7 +2,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.215
+Version:       1.2.216
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index cacaadd..6e684e3 100644 (file)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -665,11 +665,15 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &peer_mac_address);
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WFD_DBUS_REPLY_ERROR_NONE(invocation);
 
-               g_variant_get(parameters, "(&s)", &peer_mac_address);
                macaddr_atoe(peer_mac_address, mac_addr);
-
                ret = wfd_manager_connect(manager, mac_addr);
                if (ret == WIFI_DIRECT_ERROR_NONE)
                        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
@@ -705,11 +709,15 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        }
                }
 
+               g_variant_get(parameters, "(&s)", &peer_mac_address);
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WFD_DBUS_REPLY_ERROR_NONE(invocation);
 
-               g_variant_get(parameters, "(&s)", &peer_mac_address);
                macaddr_atoe(peer_mac_address, mac_addr);
-
                ret = wfd_manager_disconnect(manager, mac_addr);
                if (ret == WIFI_DIRECT_ERROR_NONE)
                        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
@@ -729,11 +737,15 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &peer_mac_address);
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WFD_DBUS_REPLY_ERROR_NONE(invocation);
 
-               g_variant_get(parameters, "(&s)", &peer_mac_address);
                macaddr_atoe(peer_mac_address, mac_addr);
-
                ret = wfd_manager_cancel_connection(manager, mac_addr);
                if (ret == WIFI_DIRECT_ERROR_NONE)
                        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
@@ -758,11 +770,15 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &peer_mac_address);
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WFD_DBUS_REPLY_ERROR_NONE(invocation);
 
-               g_variant_get(parameters, "(&s)", &peer_mac_address);
                macaddr_atoe(peer_mac_address, mac_addr);
-
                ret = wfd_manager_accept_connection(manager, mac_addr);
                if (ret == WIFI_DIRECT_ERROR_NONE) {
                        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
@@ -796,11 +812,15 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &peer_mac_address);
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WFD_DBUS_REPLY_ERROR_NONE(invocation);
 
-               g_variant_get(parameters, "(&s)", &peer_mac_address);
                macaddr_atoe(peer_mac_address, mac_addr);
-
                ret = wfd_manager_reject_connection(manager, mac_addr);
                if (ret == WIFI_DIRECT_ERROR_NONE)
                        wfd_manager_dbus_emit_signal(WFD_MANAGER_MANAGE_INTERFACE,
@@ -936,10 +956,12 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
                g_variant_get(parameters, "(&s)", &peer_mac_address);
-               macaddr_atoe(peer_mac_address, mac_addr);
-
-               builder_peer = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+               if (peer_mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
 
+               macaddr_atoe(peer_mac_address, mac_addr);
                ret = wfd_manager_get_peer_info(manager, mac_addr, &peer);
                if (ret < 0 || !peer) {
                        WDS_LOGE("Failed to get peer info");
@@ -948,6 +970,7 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        goto failed;
                }
 
+               builder_peer = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
                g_variant_builder_add(builder_peer, "{sv}",
                                "DeviceName",
                                g_variant_new_string(peer->device_name));
@@ -1218,6 +1241,11 @@ static void __wfd_manager_group_iface_handler(const gchar *method_name,
                }
 
                g_variant_get(parameters, "(&s&s)", &mac_address, &ssid);
+               if (mac_address == NULL || ssid == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                macaddr_atoe(mac_address, go_mac_address);
                WDS_LOGD("Remove persistent group [%s][" MACSTR "]", ssid, MAC2STR(go_mac_address));
 
@@ -1243,6 +1271,11 @@ static void __wfd_manager_group_iface_handler(const gchar *method_name,
                }
 
                g_variant_get(parameters, "(&s)", &passphrase);
+               if (passphrase == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                passphrase_len = strlen(passphrase);
 
                if (passphrase_len < PASSPHRASE_LEN_MIN ||
@@ -1347,6 +1380,10 @@ static void __wfd_manager_config_iface_handler(const gchar *method_name,
        } else if (!g_strcmp0(method_name, "SetDeviceName")) {
                const char *device_name = NULL;
                g_variant_get(parameters, "(&s)", &device_name);
+               if (device_name == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
 
                ret = wfd_local_set_dev_name((char *)device_name);
                if (ret < 0) {
@@ -1382,6 +1419,10 @@ static void __wfd_manager_config_iface_handler(const gchar *method_name,
                wfd_session_s *session = (wfd_session_s*) manager->session;
 
                g_variant_get(parameters, "(&s)", &pin);
+               if (pin == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
 
                if (!session) {
                        WDS_LOGE("Session not exist");
@@ -1781,6 +1822,11 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
                }
 
                g_variant_get(parameters, "(i&s)", &service_type, &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WDS_LOGD("Service type [%d]", service_type);
                macaddr_atoe(mac_address, mac_addr);
 
@@ -1810,6 +1856,11 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
                }
 
                g_variant_get(parameters, "(i&s)", &service_type, &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
                WDS_LOGD("Service type [%d]", service_type);
                macaddr_atoe(mac_address, mac_addr);
 
@@ -1993,14 +2044,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
-               g_variant_get(parameters, "(&s)", &mac_address);
-               macaddr_atoe(mac_address, mac_addr);
-
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
+               macaddr_atoe(mac_address, mac_addr);
                peer = wfd_manager_get_peer_by_addr(manager, mac_addr);
                if (!peer) {
                        WDS_LOGE("Failed to get peer");
@@ -2017,14 +2072,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
-               g_variant_get(parameters, "(&s)", &mac_address);
-               macaddr_atoe(mac_address, mac_addr);
-
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
+               macaddr_atoe(mac_address, mac_addr);
                peer = wfd_manager_get_peer_by_addr(manager, mac_addr);
                if (!peer) {
                        WDS_LOGE("Failed to get peer");
@@ -2041,14 +2100,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
-               g_variant_get(parameters, "(&s)", &mac_address);
-               macaddr_atoe(mac_address, mac_addr);
-
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
+               macaddr_atoe(mac_address, mac_addr);
                peer = wfd_manager_get_peer_by_addr(manager, mac_addr);
                if (!peer) {
                        WDS_LOGE("Failed to get peer");
@@ -2065,14 +2128,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
-               g_variant_get(parameters, "(&s)", &mac_address);
-               macaddr_atoe(mac_address, mac_addr);
-
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
+               macaddr_atoe(mac_address, mac_addr);
                peer = wfd_manager_get_peer_by_addr(manager, mac_addr);
                if (!peer) {
                        WDS_LOGE("Failed to get peer");
@@ -2089,14 +2156,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
-               g_variant_get(parameters, "(&s)", &mac_address);
-               macaddr_atoe(mac_address, mac_addr);
-
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(&s)", &mac_address);
+               if (mac_address == NULL) {
+                       ret = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+                       goto failed;
+               }
+
+               macaddr_atoe(mac_address, mac_addr);
                peer = wfd_manager_get_peer_by_addr(manager, mac_addr);
                if (!peer) {
                        WDS_LOGE("Failed to get peer");