commit 9744b79176f0821bdc8c0135b32584d07a37eebf
author Paul Stewart <pstew@google.com> Sat Mar 19 05:05:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 19 05:05:47 2016 +0000
tree 18ba2f8ee4174bfc06689797f7ca9c7958104806
parent 88deb302e5a0b009dfddf4c22719665902ebf68d
parent a01347240c781d1c9cd4c4ed342796f7910597b9

Guard against return value already being null am: 9c42c0b am: e380dbe
am: a013472

* commit 'a01347240c781d1c9cd4c4ed342796f7910597b9':
  Guard against return value already being null

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;