From: Jouni Malinen <j@w1.fi>
Date: Sat, 7 Jun 2014 12:37:31 +0000 (+0300)
Subject: Make a code path easier for static analyzers to understand
X-Git-Tag: hostap_2_3~351
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=bc32bb70d7aa53f61f261dab88fdc417b6567d9a;p=mech_eap.git

Make a code path easier for static analyzers to understand

prev cannot be NULL here in the hostapd_eid_country_add() call since
prev is set whenever start becomes non-NULL. That seems to be a bit too
difficult for some static analyzers, so check the prev pointer
explicitly to avoid false warnings.

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

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 2a4acf2..73dffe2 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -220,7 +220,7 @@ static u8 * hostapd_eid_country(struct hostapd_data *hapd, u8 *eid,
 			continue; /* can use same entry */
 		}
 
-		if (start) {
+		if (start && prev) {
 			pos = hostapd_eid_country_add(pos, end, chan_spacing,
 						      start, prev);
 			start = NULL;