aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Stewart <pstew@google.com>2016-03-18 18:14:26 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-05-09 12:37:08 -0700
commitda7ee01d6dcfe24bd9791bdac4f710d443f596d1 (patch)
tree7d4e29acf0a513c51124c16f8d004fa26eb67017
parent6471d1398a7987f6574ce25f41344bb4564e08bc (diff)
downloadandroid_external_wpa_supplicant_8-stable/cm-12.1-YOG7D.tar.gz
android_external_wpa_supplicant_8-stable/cm-12.1-YOG7D.tar.bz2
android_external_wpa_supplicant_8-stable/cm-12.1-YOG7D.zip
Guard against return value already being nullstable/cm-12.1-YOG7D
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 976e61c4..5aa0264b 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2371,8 +2371,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;