D-Bus: Fix per-iface object unregistration on not existing objects

If the private data for an object is not found, do not try to unregister
that object to avoid D-Bus errors.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
index cfa6a15162a376692f2dde5ba9da7a006f1c5a32..e26086dd158590d1d251a95a3fa7e033a92f0779 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_helpers.c
+++ b/wpa_supplicant/dbus/dbus_new_helpers.c
@@ -590,11 +590,11 @@ int wpa_dbus_unregister_object_per_iface(
        if (!obj_desc) {
                wpa_printf(MSG_ERROR, "dbus: %s: Could not obtain object's "
                           "private data: %s", __func__, path);
-       } else {
-               eloop_cancel_timeout(flush_object_timeout_handler, con,
-                                    obj_desc);
+               return 0;
        }
 
+       eloop_cancel_timeout(flush_object_timeout_handler, con, obj_desc);
+
        if (!dbus_connection_unregister_object_path(con, path))
                return -1;