diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-19 05:03:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-19 05:03:05 +0000 |
| commit | a01347240c781d1c9cd4c4ed342796f7910597b9 (patch) | |
| tree | 6c356a1383abbc33fb86084b67aed6efe069fe96 | |
| parent | 6d6d685fd8e7ace3d5d5f79aee86f192759a030c (diff) | |
| parent | e380dbeb0242a93e3fd6014fc53ea97f6a09daab (diff) | |
| download | wpa_supplicant_8-a01347240c781d1c9cd4c4ed342796f7910597b9.tar.gz | |
Guard against return value already being null am: 9c42c0b
am: e380dbe
* commit 'e380dbeb0242a93e3fd6014fc53ea97f6a09daab':
Guard against return value already being null
| -rw-r--r-- | wpa_supplicant/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 6cd96147..f782b0db 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2369,8 +2369,10 @@ char * wpa_config_get(struct wpa_ssid *ssid, const char *var) const struct parse_data *field = &ssid_fields[i]; 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; " + if (ret != NULL && (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; |