diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-18 21:00:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-18 21:00:19 +0000 |
| commit | 88deb302e5a0b009dfddf4c22719665902ebf68d (patch) | |
| tree | f97a29fcff2e8bacf5568a00bf6cafa549103b18 | |
| parent | 68cc9467a2c5a3244a026c4c3be4cc0f047395d5 (diff) | |
| parent | 6d6d685fd8e7ace3d5d5f79aee86f192759a030c (diff) | |
| download | wpa_supplicant_8-88deb302e5a0b009dfddf4c22719665902ebf68d.tar.gz | |
Remove newlines from config output am: 85c72c6 am: 7b5a1a8
am: 6d6d685
* commit '6d6d685fd8e7ace3d5d5f79aee86f192759a030c':
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; |