Remove unnecessary NULL check to make function more consistent
authorJouni Malinen <j@w1.fi>
Sun, 1 Mar 2015 20:15:44 +0000 (22:15 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 1 Mar 2015 20:36:53 +0000 (22:36 +0200)
Static analyzers may warn about dereference before NULL check in
wpas_network_disabled() due to the new code added to check
wpa_s->p2p_mgmt. wpa_s cannot be NULL here, so remove the unneeded check
for it later in the function. (CID 106124)

Signed-off-by: Jouni Malinen <j@w1.fi>
wpa_supplicant/wpa_supplicant.c

index 5848202..19fb890 100644 (file)
@@ -4986,7 +4986,7 @@ int wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
        if (ssid->disabled)
                return 1;
 
-       if (wpa_s && wpa_s->drv_capa_known)
+       if (wpa_s->drv_capa_known)
                drv_enc = wpa_s->drv_enc;
        else
                drv_enc = (unsigned int) -1;