From 7adc3c129657edb36134ae321b5f45ddb2cd9cdb Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 13 Nov 2011 22:47:14 +0200 Subject: 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 --- src/eap_peer/eap_fast.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/eap_peer') diff --git a/src/eap_peer/eap_fast.c b/src/eap_peer/eap_fast.c index 8bd4678..3cfb41a 100644 --- a/src/eap_peer/eap_fast.c +++ b/src/eap_peer/eap_fast.c @@ -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; -- cgit v1.1