Fix SVace issue 142066

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

diff --git a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
index 58f9361..0d6f46e 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
@@ -2189,6 +2189,11 @@ static gboolean ws_event_handler(GIOChannel *source,
        wfd_oem_event_s event;
        int res = 0;
 
+       if (!g_pd) {
+               WDP_LOGE("event cannot be handled");
+               return FALSE;
+       }
+
        if (!sd) {
                WDP_LOGE("Invalid parameter");
                /* TODO: if error count is more than 10, disconnect this interface and reset sock data */
@@ -2224,22 +2229,22 @@ static gboolean ws_event_handler(GIOChannel *source,
        switch (event.event_id) {
        case WS_EVENT_DEVICE_FOUND:
                event.event_id = WFD_OEM_EVENT_PEER_FOUND;
-               if (g_pd && g_pd->callback && g_pd->callback->peer_found_cb)
+               if (g_pd->callback && g_pd->callback->peer_found_cb)
                        g_pd->callback->peer_found_cb(&event);
                break;
        case WS_EVENT_DEVICE_LOST:
                event.event_id = WFD_OEM_EVENT_PEER_DISAPPEARED;
-               if (g_pd && g_pd->callback && g_pd->callback->peer_disappeared_cb)
+               if (g_pd->callback && g_pd->callback->peer_disappeared_cb)
                        g_pd->callback->peer_disappeared_cb(&event);
                break;
        case WS_EVENT_FIND_STOPED:
                event.event_id = WFD_OEM_EVENT_DISCOVERY_FINISHED;
-               if (g_pd && g_pd->callback && g_pd->callback->discovery_finished_cb)
+               if (g_pd->callback && g_pd->callback->discovery_finished_cb)
                        g_pd->callback->discovery_finished_cb(&event);
                break;
        case WS_EVENT_PROV_DISC_PBC_REQ:
                event.event_id = WFD_OEM_EVENT_PROV_DISC_REQ;
-               if (g_pd && g_pd->callback && g_pd->callback->prov_disc_req_cb)
+               if (g_pd->callback && g_pd->callback->prov_disc_req_cb)
                        g_pd->callback->prov_disc_req_cb(&event);
                break;
        case WS_EVENT_PROV_DISC_PBC_RESP:
@@ -2250,7 +2255,7 @@ static gboolean ws_event_handler(GIOChannel *source,
                        WDP_LOGE("Invalid peer mac address[" MACSTR "]", MAC2STR(event.dev_addr));
                        goto done;
                }
-               if (g_pd && g_pd->callback && g_pd->callback->prov_disc_resp_cb)
+               if (g_pd->callback && g_pd->callback->prov_disc_resp_cb)
                        g_pd->callback->prov_disc_resp_cb(&event);
                break;
        case WS_EVENT_PROV_DISC_SHOW_PIN:
@@ -2259,12 +2264,12 @@ static gboolean ws_event_handler(GIOChannel *source,
                        event.event_id = WFD_OEM_EVENT_PROV_DISC_RESP;
                        memset(g_pd_out, 0x0, OEM_MACADDR_LEN);
                        WDP_LOGD("Peer mac address verified");
-                       if (g_pd && g_pd->callback && g_pd->callback->prov_disc_resp_cb)
+                       if (g_pd->callback && g_pd->callback->prov_disc_resp_cb)
                                g_pd->callback->prov_disc_resp_cb(&event);
                } else if (!memcmp(g_pd_out, null_mac, OEM_MACADDR_LEN)) {
                        event.event_id = WFD_OEM_EVENT_PROV_DISC_REQ;
                        WDP_LOGD("      PD request from peer[" MACSTR "]", MAC2STR(event.dev_addr));
-                       if (g_pd && g_pd->callback && g_pd->callback->prov_disc_req_cb)
+                       if (g_pd->callback && g_pd->callback->prov_disc_req_cb)
                                g_pd->callback->prov_disc_req_cb(&event);
                } else {
                        WDP_LOGE("Invalid peer mac address[" MACSTR "]", MAC2STR(event.dev_addr));
@@ -2278,32 +2283,32 @@ static gboolean ws_event_handler(GIOChannel *source,
                        memset(g_pd_out, 0x0, OEM_MACADDR_LEN);
                        WDP_LOGD("Peer mac address verified, but PD failed");
                }
-               if (g_pd && g_pd->callback && g_pd->callback->prov_disc_fail_cb)
+               if (g_pd->callback && g_pd->callback->prov_disc_fail_cb)
                        g_pd->callback->prov_disc_fail_cb(&event);
                break;
        case WS_EVENT_GO_NEG_REQUEST:
                event.event_id = WFD_OEM_EVENT_GO_NEG_REQ;
-               if (g_pd && g_pd->callback && g_pd->callback->go_neg_req_cb)
+               if (g_pd->callback && g_pd->callback->go_neg_req_cb)
                        g_pd->callback->go_neg_req_cb(&event);
                break;
        case WS_EVENT_GO_NEG_FAILURE:
                event.event_id = WFD_OEM_EVENT_GO_NEG_FAIL;
-               if (g_pd && g_pd->callback && g_pd->callback->go_neg_fail_cb)
+               if (g_pd->callback && g_pd->callback->go_neg_fail_cb)
                        g_pd->callback->go_neg_fail_cb(&event);
                break;
        case WS_EVENT_GO_NEG_SUCCESS:
                event.event_id = WFD_OEM_EVENT_GO_NEG_DONE;
-               if (g_pd && g_pd->callback && g_pd->callback->go_neg_done_cb)
+               if (g_pd->callback && g_pd->callback->go_neg_done_cb)
                        g_pd->callback->go_neg_done_cb(&event);
                break;
        case WS_EVENT_WPS_FAIL:
                event.event_id = WFD_OEM_EVENT_WPS_FAIL;
-               if (g_pd && g_pd->callback && g_pd->callback->wps_fail_cb)
+               if (g_pd->callback && g_pd->callback->wps_fail_cb)
                        g_pd->callback->wps_fail_cb(&event);
                break;
        case WS_EVENT_GROUP_FORMATION_FAILURE:
                event.event_id = WFD_OEM_EVENT_WPS_FAIL;
-               if (g_pd && g_pd->callback && g_pd->callback->group_formation_failure_cb)
+               if (g_pd->callback && g_pd->callback->group_formation_failure_cb)
                        g_pd->callback->group_formation_failure_cb(&event);
                break;
        case WS_EVENT_WPS_SUCCESS:
@@ -2311,12 +2316,12 @@ static gboolean ws_event_handler(GIOChannel *source,
        case WS_EVENT_GROUP_FORMATION_SUCCESS:
                event.event_id = WFD_OEM_EVENT_WPS_DONE;
                /* TODO: connect to supplicant via group interface */
-               if (g_pd && g_pd->callback && g_pd->callback->wps_done_cb)
+               if (g_pd->callback && g_pd->callback->wps_done_cb)
                        g_pd->callback->wps_done_cb(&event);
                break;
        case WS_EVENT_STA_CONNECTED:
                event.event_id = WFD_OEM_EVENT_STA_CONNECTED;
-               if (g_pd && g_pd->callback && g_pd->callback->sta_connected_cb)
+               if (g_pd->callback && g_pd->callback->sta_connected_cb)
                        g_pd->callback->sta_connected_cb(&event);
                break;
        case WS_EVENT_GROUP_STARTED:
@@ -2331,7 +2336,7 @@ static gboolean ws_event_handler(GIOChannel *source,
                                /* goto done; */
                        }
                }
-               if (g_pd && g_pd->callback && g_pd->callback->group_created_cb)
+               if (g_pd->callback && g_pd->callback->group_created_cb)
                        g_pd->callback->group_created_cb(&event);
                break;
        case WS_EVENT_GROUP_REMOVED:
@@ -2351,33 +2356,33 @@ static gboolean ws_event_handler(GIOChannel *source,
                                _ws_flush();
                        }
                }
-               if (g_pd && g_pd->callback && g_pd->callback->group_destroyed_cb)
+               if (g_pd->callback && g_pd->callback->group_destroyed_cb)
                        g_pd->callback->group_destroyed_cb(&event);
                break;
        case WS_EVENT_INVITATION_RECEIVED:
                event.event_id = WFD_OEM_EVENT_INVITATION_REQ;
-               if (g_pd && g_pd->callback && g_pd->callback->invitation_req_cb)
+               if (g_pd->callback && g_pd->callback->invitation_req_cb)
                        g_pd->callback->invitation_req_cb(&event);
                break;
        case WS_EVENT_INVITATION_RESULT:
                event.event_id = WFD_OEM_EVENT_INVITATION_RES;
-               if (g_pd && g_pd->callback && g_pd->callback->invitation_resp_cb)
+               if (g_pd->callback && g_pd->callback->invitation_resp_cb)
                        g_pd->callback->invitation_resp_cb(&event);
                break;
        case WS_EVENT_STA_DISCONNECTED:
                event.event_id = WFD_OEM_EVENT_STA_DISCONNECTED;
-               if (g_pd && g_pd->callback && g_pd->callback->sta_disconnected_cb)
+               if (g_pd->callback && g_pd->callback->sta_disconnected_cb)
                        g_pd->callback->sta_disconnected_cb(&event);
                break;
        case WS_EVENT_TERMINATING:
                event.event_id = WFD_OEM_EVENT_DEACTIVATED;
-               if (g_pd && g_pd->callback && g_pd->callback->deactivated_cb)
+               if (g_pd->callback && g_pd->callback->deactivated_cb)
                        g_pd->callback->deactivated_cb(&event);
                break;
 #ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        case WS_EVENT_SERV_DISC_RESP:
                event.event_id = WFD_OEM_EVENT_SERV_DISC_RESP;
-               if (g_pd && g_pd->callback && g_pd->callback->serv_disc_resp_cb)
+               if (g_pd->callback && g_pd->callback->serv_disc_resp_cb)
                        g_pd->callback->serv_disc_resp_cb(&event);
                break;
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */