From: Simon McVittie <smcv@collabora.com>
Date: Tue, 17 Apr 2018 11:48:23 +0000 (+0100)
Subject: bus_service_list_queued_owners: Don't return a DBusError
X-Git-Tag: dbus-1.13.6~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73894602477d0a9d7fa55cea1d453f20b8790cf0;p=thirdparty%2Fdbus.git

bus_service_list_queued_owners: Don't return a DBusError

This makes it clearer that the only possible error is out-of-memory,
so its use in ListQueuedOwners() is not leaking information to callers
that might not be allowed to know the difference between "doesn't exist"
and "exists but you are not allowed to know that".

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105656
---

diff --git a/bus/driver.c b/bus/driver.c
index a131170d9..8015f28ba 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -1581,10 +1581,11 @@ bus_driver_handle_list_queued_owners (DBusConnection *connection,
     }
   else
     {
-      if (!bus_service_list_queued_owners (service,
-                                           &base_names,
-                                           error))
-        goto failed;
+      if (!bus_service_list_queued_owners (service, &base_names))
+        {
+          BUS_SET_OOM (error);
+          goto failed;
+        }
     }
 
   _dbus_assert (base_names != NULL);
diff --git a/bus/services.c b/bus/services.c
index 127edda0e..b7a4fdfd2 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -1289,8 +1289,7 @@ bus_service_has_owner (BusService     *service,
 
 dbus_bool_t 
 bus_service_list_queued_owners (BusService *service,
-                                DBusList  **return_list,
-                                DBusError  *error)
+                                DBusList  **return_list)
 {
   DBusList *link;
 
@@ -1317,6 +1316,5 @@ bus_service_list_queued_owners (BusService *service,
   
  oom:
   _dbus_list_clear (return_list);
-  BUS_SET_OOM (error);
   return FALSE;
 }
diff --git a/bus/services.h b/bus/services.h
index 056dd9faa..4ec510f38 100644
--- a/bus/services.h
+++ b/bus/services.h
@@ -87,8 +87,7 @@ BusOwner*       bus_service_get_primary_owner         (BusService     *service);
 dbus_bool_t     bus_service_get_allow_replacement     (BusService     *service);
 const char*     bus_service_get_name                  (BusService     *service);
 dbus_bool_t     bus_service_list_queued_owners        (BusService *service,
-                                                       DBusList  **return_list,
-                                                       DBusError  *error);
+                                                       DBusList  **return_list);
 
 DBusConnection* bus_service_get_primary_owners_connection (BusService     *service);
 #endif /* BUS_SERVICES_H */