Remove newlines from config output am: 85c72c6
am: 7b5a1a8

* commit '7b5a1a8a9c7cd02780770625e89a51f8128ebd74':
  Remove newlines from config output
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 8cd4a2f..6cd9614 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2367,8 +2367,16 @@
 
 	for (i = 0; i < NUM_SSID_FIELDS; i++) {
 		const struct parse_data *field = &ssid_fields[i];
-		if (os_strcmp(var, field->name) == 0)
-			return field->writer(field, ssid);
+		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; "
+					"not returning it", var);
+				os_free(ret);
+				ret = NULL;
+			}
+			return ret;
+		}
 	}
 
 	return NULL;