diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-18 18:14:26 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 13:31:37 -0700 |
| commit | 3fae96d7ce5a53dee2e54343f7a6daca6d77fd7f (patch) | |
| tree | 75f285c1a03dec314e240b08c8d0610f9e16e53c | |
| parent | 3a22e116eb3bfe53350e79b2623529eadf796c7b (diff) | |
| download | android_external_wpa_supplicant_8-stable/cm-13.0-ZNH0E.tar.gz android_external_wpa_supplicant_8-stable/cm-13.0-ZNH0E.tar.bz2 android_external_wpa_supplicant_8-stable/cm-13.0-ZNH0E.zip | |
Guard against return value already being nullstable/cm-13.0-ZNH0E
If there is no retrieved parameter, we should not de-reference null
Ticket: CYNGNOS-2373
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 653d9dc6..ee69ab08 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2606,8 +2606,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; |