]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
dbus: Fix property DebugShowKeys and DebugTimestamp
authorClemens Famulla-Conrad <cfamullaconrad@suse.de>
Tue, 5 Jul 2022 11:11:28 +0000 (13:11 +0200)
committerJouni Malinen <j@w1.fi>
Fri, 16 Sep 2022 19:15:56 +0000 (22:15 +0300)
It is possible to specify -t or -K multiple times. With this the
value isn't boolean anymore and we hit a assert in libdbus
function `dbus_message_iter_append_basic()`, which expect 0 or 1
for DBUS_TYPE_BOOLEAN.

Signed-off-by: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
wpa_supplicant/dbus/dbus_new_handlers.c

index 7e83db223f181ac8d2395ea11b40cccb5d82e4d5..f170d110c58544d09dc8eb165f359784faaaedf4 100644 (file)
@@ -908,8 +908,10 @@ dbus_bool_t wpas_dbus_getter_debug_timestamp(
        const struct wpa_dbus_property_desc *property_desc,
        DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+       dbus_bool_t b = wpa_debug_timestamp ? TRUE : FALSE;
+
        return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
-                                               &wpa_debug_timestamp, error);
+                                               &b, error);
 
 }
 
@@ -927,8 +929,10 @@ dbus_bool_t wpas_dbus_getter_debug_show_keys(
        const struct wpa_dbus_property_desc *property_desc,
        DBusMessageIter *iter, DBusError *error, void *user_data)
 {
+       dbus_bool_t b = wpa_debug_show_keys ? TRUE : FALSE;
+
        return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
-                                               &wpa_debug_show_keys, error);
+                                               &b, error);
 
 }