projects
/
mech_eap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11973b2
)
D-Bus: Fix WPS ConfigMethods getter to handle no value properly
author
Jouni Malinen
<j@w1.fi>
Fri, 26 Dec 2014 17:57:24 +0000
(19:57 +0200)
committer
Jouni Malinen
<j@w1.fi>
Mon, 29 Dec 2014 13:49:05 +0000
(15:49 +0200)
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 <j@w1.fi>
wpa_supplicant/dbus/dbus_new_handlers_wps.c
patch
|
blob
|
history
diff --git
a/wpa_supplicant/dbus/dbus_new_handlers_wps.c
b/wpa_supplicant/dbus/dbus_new_handlers_wps.c
index
8ecf7db
..
4226f2f
100644
(file)
--- 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);
}