commit 163d22e14be671b07e05a4fcf9c90a5a039c9bc1
author Paul Stewart <pstew@google.com> Fri Mar 18 18:14:26 2016 -0700
committer The Android Automerger <android-build@google.com> Fri Mar 25 17:07:30 2016 -0700
tree 7a4c951f3b02373ed380c8420fb0c29c4229ddfc
parent 7b90d949357ca539277d90c04641675c076991c8

Guard against return value already being null

If there is no retrieved parameter, we should not de-reference null

Bug: 27748546
Change-Id: I8e6ceba26ab7d73ab365b72c0bfdcdb0a36a59a7

wpa_supplicant/config.c

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index d2aacce..467f586 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2371,8 +2371,10 @@
 		const struct parse_data *field = &ssid_fields[i];
 		if (os_strcmp(var, field->name) == 0) {
 			char *ret = field->writer(field, ssid);
-			if (os_strchr(ret, '\r') != NULL || os_strchr(ret, '\n') != NULL) {
-				wpa_printf(MSG_ERROR, "Found newline in value for %s; "
+			if (ret != NULL && (os_strchr(ret, '\r') != NULL ||
+				os_strchr(ret, '\n') != NULL)) {
+				wpa_printf(MSG_ERROR,
+					"Found newline in value for %s; "
 					"not returning it", var);
 				os_free(ret);
 				ret = NULL;