From: Jouni Malinen <j@w1.fi>
Date: Sun, 29 Jun 2014 21:56:27 +0000 (+0300)
Subject: Check for no key_mgmt/proto/auth_alg entries in config writer
X-Git-Tag: hostap_2_3~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e46f320d32b24b231663eecdb501f80c486f32;p=thirdparty%2Fhostap.git

Check for no key_mgmt/proto/auth_alg entries in config writer

This is not really necessary check, but it keeps a static analyzer
happier by avoiding dead increment. Doing it this way rather than
removing the increment is less likely to cause problems when new entries
are added here in the future (the "dead" increment would be very much
needed in those cases).

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

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 16031c923..36558c908 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -467,6 +467,11 @@ static char * wpa_config_write_proto(const struct parse_data *data,
 		pos += ret;
 	}
 
+	if (pos == buf) {
+		os_free(buf);
+		buf = NULL;
+	}
+
 	return buf;
 }
 #endif /* NO_CONFIG_WRITE */
@@ -672,6 +677,11 @@ static char * wpa_config_write_key_mgmt(const struct parse_data *data,
 	}
 #endif /* CONFIG_WPS */
 
+	if (pos == buf) {
+		os_free(buf);
+		buf = NULL;
+	}
+
 	return buf;
 }
 #endif /* NO_CONFIG_WRITE */
@@ -863,6 +873,11 @@ static char * wpa_config_write_auth_alg(const struct parse_data *data,
 		pos += ret;
 	}
 
+	if (pos == buf) {
+		os_free(buf);
+		buf = NULL;
+	}
+
 	return buf;
 }
 #endif /* NO_CONFIG_WRITE */