Make phase2_method initialization easier for static analyzers

data->phase2_method cannot really be NULL if
eap_fast_init_phase2_method() returns success, but this construction
seems to be too difficult for some static analyzers. While this change
is not really needed in practice, it makes it easier to go through
warnings from such analyzers.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-11-13 22:47:14 +02:00
parent 4c8a333b54
commit 7adc3c1296

View file

@ -444,8 +444,9 @@ static int eap_fast_phase2_request(struct eap_sm *sm,
return 0;
}
if (data->phase2_priv == NULL &&
eap_fast_init_phase2_method(sm, data) < 0) {
if ((data->phase2_priv == NULL &&
eap_fast_init_phase2_method(sm, data) < 0) ||
data->phase2_method == NULL) {
wpa_printf(MSG_INFO, "EAP-FAST: Failed to initialize "
"Phase 2 EAP method %d", *pos);
ret->methodState = METHOD_DONE;