Fix SVACE issues [84118, 84119, 84130, 84132, 84140]

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

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index cb0870a..ca1aa1b 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.172
+Version:       1.2.173
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index e6c34cd..56429a5 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -757,8 +757,7 @@ static void __ws_peer_property(const char *key, GVariant *value, void *user_data
                        peer->dev_role = WFD_OEM_DEV_ROLE_GC;
 #if defined(TIZEN_FEATURE_ASP)
        } else if (g_strcmp0(key, "AdvertiseService") == 0) {
-               WDP_LOGD("size [%d]", g_variant_get_size(value));
-               if (g_variant_get_size(value) != 0)
+               if (value != NULL && g_variant_get_size(value) != 0)
                        peer->has_asp_services = 1;
                else
                        peer->has_asp_services = 0;
@@ -1596,11 +1595,13 @@ GLIST_ITER_START(seek_list, seek)
                                seek = NULL;
                        }
 GLIST_ITER_END()
+
                        if (seek != NULL && seek->service_info != NULL) {
                                WDP_LOGD("service info exists, service discovery will be performed");
                        } else {
                                WDP_LOGD("service info doesn't exists. Add service to list");
-                               service->search_id = seek->search_id;
+                               if (seek)
+                                       service->search_id = seek->search_id;
                                *asp_services = g_list_append(*asp_services, service);
                        }
                }
@@ -1649,9 +1650,9 @@ static void _ws_process_device_found(GDBusConnection *connection,
                wfd_oem_advertise_service_s *service;
                for (l = (GList *)event.asp_services; l != NULL; l = l->next) {
                        service = (wfd_oem_advertise_service_s *)l->data;
+                       event.asp_services = g_list_remove(l, service);
                        g_free(service->service_type);
                        g_free(service);
-                       event.asp_services = g_list_remove(l, service);
                }
                g_list_free(l);
        }
@@ -2318,7 +2319,7 @@ GLIST_ITER_START(seek_list, tmp)
        }
 GLIST_ITER_END()
 
-       if (tmp->service_info != NULL)
+       if (tmp != NULL && tmp->service_info != NULL)
                g_pd->callback(g_pd->user_data, &event);
        else
                WDP_LOGD("service info is not required, don't notify to user");

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 0fbc0bc..0623e14 100755 (executable)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1441,6 +1441,22 @@ static void __wfd_process_asp_serv_resp(wfd_manager_s *manager, wfd_oem_event_s
        __WDS_LOG_FUNC_EXIT__;
        return;
 }
+
+static void __wfd_process_asp_prov_start(wfd_manager_s *manager, wfd_oem_event_s *event)
+{
+       __WDS_LOG_FUNC_ENTER__;
+
+       __WDS_LOG_FUNC_EXIT__;
+       return;
+}
+
+static void __wfd_process_asp_prov_done(wfd_manager_s *manager, wfd_oem_event_s *event)
+{
+       __WDS_LOG_FUNC_ENTER__;
+
+       __WDS_LOG_FUNC_EXIT__;
+       return;
+}
 #endif /* TIZEN_FEATURE_ASP */
 
 static struct {
@@ -1567,6 +1583,14 @@ static struct {
                WFD_OEM_EVENT_ASP_SERV_RESP,
                __wfd_process_asp_serv_resp,
        },
+       {
+               WFD_OEM_EVENT_ASP_PROV_START,
+               __wfd_process_asp_prov_start
+       },
+       {
+               WFD_OEM_EVENT_ASP_PROV_DONE,
+               __wfd_process_asp_prov_done
+       },
 #endif /* TIZEN_FEATURE_ASP */
        {
                WFD_OEM_EVENT_MAX,