dbus: Close dbus dict just after appending data

Before fixing this issue, calling wpas_dbus_getter_p2p_device_config
was causing early termination of dbus connection, due to writing
values to an already closed dict.

Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
index 516551a9887fcb8af04c2a1716c3a4e273e530a6..c9ecc7b429040f1abf595a9e7f506f9acc416a90 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
@@ -830,15 +830,15 @@ dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter,
                                       wpa_s->conf->p2p_no_group_iface))
                goto err_no_mem;
 
-       if (!wpa_dbus_dict_close_write(&variant_iter, &dict_iter) ||
-           !dbus_message_iter_close_container(iter, &variant_iter))
-               goto err_no_mem;
-
        /* P2P Search Delay */
        if (!wpa_dbus_dict_append_uint32(&dict_iter, "p2p_search_delay",
                                         wpa_s->conf->p2p_search_delay))
                goto err_no_mem;
 
+       if (!wpa_dbus_dict_close_write(&variant_iter, &dict_iter) ||
+           !dbus_message_iter_close_container(iter, &variant_iter))
+               goto err_no_mem;
+
        return TRUE;
 
 err_no_mem: