Guard against return value already being null am: 9c42c0b am: e380dbe
am: a013472
* commit 'a01347240c781d1c9cd4c4ed342796f7910597b9':
Guard against return value already being null
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index d2aacce..467f586 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2371,8 +2371,10 @@
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;