diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-18 22:06:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-18 22:06:00 +0000 |
| commit | e95dd0089dc63d79ff33aa87e2a31408befddfbf (patch) | |
| tree | e1d0de6f70161c758f23d5a2ba059c88366fe9c6 | |
| parent | f9e47b690c718a1837bcc7b0e048ed0d196250af (diff) | |
| parent | 344129d3c949bf5cb9b2151acc355a3d3c437d53 (diff) | |
| download | wpa_supplicant_8-e95dd0089dc63d79ff33aa87e2a31408befddfbf.tar.gz | |
Remove newlines from config output am: 85c72c6 am: 7b5a1a8 am: 6d6d685 am: 88deb30 am: 1788f70 am: 3dbea20
am: 344129d
* commit '344129d3c949bf5cb9b2151acc355a3d3c437d53':
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 eff10438..b59ebd10 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2623,8 +2623,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; |