From 731ef436d163b3954296f2bf268e8ba5059f99c9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 31 Aug 2013 16:46:24 +0300 Subject: [PATCH] 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 --- wpa_supplicant/dbus/dbus_new_helpers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c index cfa6a1516..e26086dd1 100644 --- 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; -- 2.47.2