diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-07-07 11:51:08 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-07-07 14:23:10 -0700 |
| commit | 3d3b2ea0a8954a0927520ab9495774716fd9e001 (patch) | |
| tree | 30683f427c74e83d51a1fdf1b8592aceb4e8dd67 | |
| parent | 782ab886ad5cf13a92c5e40e5139c6aa160184b3 (diff) | |
| parent | b845b81ec6d724bd359cdb77f515722dd4066cf8 (diff) | |
| download | android_external_wpa_supplicant_8-3d3b2ea0a8954a0927520ab9495774716fd9e001.tar.gz android_external_wpa_supplicant_8-3d3b2ea0a8954a0927520ab9495774716fd9e001.tar.bz2 android_external_wpa_supplicant_8-3d3b2ea0a8954a0927520ab9495774716fd9e001.zip | |
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020
Change-Id: Id6463c0079b8456594f7661c39b41810291fb40b
| -rw-r--r-- | wpa_supplicant/config.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index b736394a..63256740 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2607,8 +2607,18 @@ char * wpa_config_get(struct wpa_ssid *ssid, const char *var) 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; |