diff options
author | Paul Stewart <pstew@google.com> | 2016-03-18 21:06:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-18 21:06:05 +0000 |
commit | 1788f701327a5a4ec84ee699b407ab56b397b96c (patch) | |
tree | e3d4984edbb26424537ef63d7d4b1ed3a3c23a51 | |
parent | 0c96662c2796d9a1ae9191230ac97a02b3d60634 (diff) | |
parent | 88deb302e5a0b009dfddf4c22719665902ebf68d (diff) | |
download | wpa_supplicant_8-1788f701327a5a4ec84ee699b407ab56b397b96c.tar.gz |
Remove newlines from config output am: 85c72c6 am: 7b5a1a8 am: 6d6d685
am: 88deb30
* commit '88deb302e5a0b009dfddf4c22719665902ebf68d':
Remove newlines from config output
-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 b7f259b6..d2aacce2 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2369,8 +2369,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; |