From 5df93208bdc162840ebda387a1512c01aa4f00be Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Fri, 9 Sep 2016 14:01:54 +0900 Subject: [PATCH] Fix SVace issues Description : The condition for checking NULL pointer was wrong. Change-Id: I4b6bec23b2bb4b380ff8b51ca1c864c642ff5c3f Signed-off-by: Yu jiung --- packaging/wifi-direct-manager.spec | 2 +- .../ctrl_iface_sock/wfd-plugin-wpasupplicant.c | 44 +++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec index 889c48c..2938e49 100644 --- 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.202 +Version: 1.2.203 Release: 1 Group: Network & Connectivity/Wireless License: Apache-2.0 diff --git a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c index 22736bd..77394ef 100644 --- a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c +++ b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c @@ -2224,22 +2224,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 && !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 && !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 && !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 && !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 +2250,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 && !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 +2259,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 && !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 && !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 +2278,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 && !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 && !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 && !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 && !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 && !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 && !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 +2311,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 && !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 && !g_pd->callback && !g_pd->callback->sta_connected_cb) g_pd->callback->sta_connected_cb(&event); break; case WS_EVENT_GROUP_STARTED: @@ -2331,7 +2331,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 && !g_pd->callback && !g_pd->callback->group_created_cb) g_pd->callback->group_created_cb(&event); break; case WS_EVENT_GROUP_REMOVED: @@ -2351,33 +2351,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 && !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 && !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 && !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 && !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 && !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 && !g_pd->callback && !g_pd->callback->serv_disc_resp_cb) g_pd->callback->serv_disc_resp_cb(&event); break; #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */ -- 2.7.4