From: Jouni Malinen <j@w1.fi>
Date: Sun, 13 Nov 2011 20:47:14 +0000 (+0200)
Subject: Make phase2_method initialization easier for static analyzers
X-Git-Tag: aosp-jb-start~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7adc3c129657edb36134ae321b5f45ddb2cd9cdb;p=thirdparty%2Fhostap.git

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>
---

diff --git a/src/eap_peer/eap_fast.c b/src/eap_peer/eap_fast.c
index 8bd467864..3cfb41ab2 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;