diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-18 18:14:26 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-04 17:55:39 +0300 |
| commit | 222f4318ea53e0adea967d9828234ad9b34df7ba (patch) | |
| tree | e02f84d95d5f9ea6e2824194cc802ed831302f88 | |
| parent | d424951ceaab546870ca0918a9e33141d330193f (diff) | |
| download | android_external_wpa_supplicant_8-222f4318ea53e0adea967d9828234ad9b34df7ba.tar.gz android_external_wpa_supplicant_8-222f4318ea53e0adea967d9828234ad9b34df7ba.tar.bz2 android_external_wpa_supplicant_8-222f4318ea53e0adea967d9828234ad9b34df7ba.zip | |
Guard against return value already being null
If there is no retrieved parameter, we should not de-reference null
Bug: 27748546
Change-Id: I8e6ceba26ab7d73ab365b72c0bfdcdb0a36a59a7
| -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 ec67be0b..8708ae75 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2224,8 +2224,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; |