commit f39a9b0ed9856cf0ee1c9e3d11b61bcb428909ca
author Paul Stewart <pstew@google.com> Sat Mar 19 05:13:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 19 05:13:06 2016 +0000
tree db04709e779255baeccaa4e579bdb0668d0fac37
parent 3dbea20fb6570e548e831910e108b2307d6232ba
parent 62c35f65f3effb640f5f800a5ce36d1069b356cb

Guard against return value already being null am: 9c42c0b am: e380dbe am: a013472 am: 9744b79
am: 62c35f6

* commit '62c35f65f3effb640f5f800a5ce36d1069b356cb':
  Guard against return value already being null

wpa_supplicant/config.c

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 4051ae1..8a34e84 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2604,8 +2604,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;