diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-18 21:34:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-18 21:34:09 +0000 |
| commit | 3dbea20fb6570e548e831910e108b2307d6232ba (patch) | |
| tree | 63d97257176f6648f85e15ec8ea5fabd1b4ac2ef | |
| parent | d9d8e396f6d4c64aac6b6a70293b5142634616ce (diff) | |
| parent | 1788f701327a5a4ec84ee699b407ab56b397b96c (diff) | |
| download | android_external_wpa_supplicant_8-3dbea20fb6570e548e831910e108b2307d6232ba.tar.gz android_external_wpa_supplicant_8-3dbea20fb6570e548e831910e108b2307d6232ba.tar.bz2 android_external_wpa_supplicant_8-3dbea20fb6570e548e831910e108b2307d6232ba.zip | |
Remove newlines from config output am: 85c72c6 am: 7b5a1a8 am: 6d6d685 am: 88deb30
am: 1788f70
* commit '1788f701327a5a4ec84ee699b407ab56b397b96c':
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 4d801ccf..4051ae17 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2602,8 +2602,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; |