merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 4d801cc..8a34e84 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2602,8 +2602,18 @@
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 (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;
+ }
+ return ret;
+ }
}
return NULL;
