diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-03 15:33:47 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-04 17:55:39 +0300 |
| commit | d424951ceaab546870ca0918a9e33141d330193f (patch) | |
| tree | 69d20e561e1121a562ba69c495bb22535b351975 | |
| parent | 1c7840403fda97c44294f621e1dad8fc53b94d4b (diff) | |
| download | android_external_wpa_supplicant_8-d424951ceaab546870ca0918a9e33141d330193f.tar.gz android_external_wpa_supplicant_8-d424951ceaab546870ca0918a9e33141d330193f.tar.bz2 android_external_wpa_supplicant_8-d424951ceaab546870ca0918a9e33141d330193f.zip | |
Remove newlines from config output
Spurious newlines output while writing the config file can
corrupt the wpa_supplicant configuration. Avoid writing these.
Bug: 27371366
Change-Id: I3bb99b8c46dba1c81cbccc76ed0cd01abc3ccef9
| -rw-r--r-- | wpa_supplicant/config.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 2b8b667a..ec67be0b 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2222,8 +2222,16 @@ 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 (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; |