From d20be3a7396ed3cb52f6dfd39ffd8bb09c69d9d8 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 26 Dec 2014 19:57:24 +0200 Subject: [PATCH] D-Bus: Fix WPS ConfigMethods getter to handle no value properly wpas_dbus_simple_property_getter() cannot be used with NULL DBUS_TYPE_STRING, so replace that with an empty string to handle the case of no config_methods parameter in the configuration. Signed-off-by: Jouni Malinen --- wpa_supplicant/dbus/dbus_new_handlers_wps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c index 8ecf7dba5..4226f2f2f 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c @@ -408,6 +408,8 @@ dbus_bool_t wpas_dbus_getter_config_methods(DBusMessageIter *iter, struct wpa_supplicant *wpa_s = user_data; char *methods = wpa_s->conf->config_methods; + if (methods == NULL) + methods = ""; return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, &methods, error); }