Fix a few resource leaks in error paths

[elogind.git] / src / libsystemd-bus / bus-objects.c

diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index 941c2810d877136750386adb1799f41c6adb15a4..5aa83a44262c4952156b1c254b3e13dde5e20a06 100644 (file)
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -51,7 +51,7 @@ static int node_vtable_get_userdata(
                 if (r < 0)
                         return r;
                 if (sd_bus_error_is_set(error))
-                        return sd_bus_error_get_errno(error);
+                        return -sd_bus_error_get_errno(error);
                 if (r == 0)
                         return r;
         }
@@ -117,7 +117,7 @@ static int add_enumerated_to_set(
                 if (r < 0)
                         return r;
                 if (sd_bus_error_is_set(error))
-                        return sd_bus_error_get_errno(error);
+                        return -sd_bus_error_get_errno(error);
 
                 STRV_FOREACH(k, children) {
                         if (r < 0) {
@@ -419,7 +419,7 @@ static int invoke_property_get(
                 if (r < 0)
                         return r;
                 if (sd_bus_error_is_set(error))
-                        return sd_bus_error_get_errno(error);
+                        return -sd_bus_error_get_errno(error);
                 return r;
         }
 
@@ -475,7 +475,7 @@ static int invoke_property_set(
                 if (r < 0)
                         return r;
                 if (sd_bus_error_is_set(error))
-                        return sd_bus_error_get_errno(error);
+                        return -sd_bus_error_get_errno(error);
                 return r;
         }
 
@@ -633,10 +633,16 @@ static int vtable_append_all_properties(
         assert(path);
         assert(c);
 
+        if (c->vtable[0].flags & SD_BUS_VTABLE_HIDDEN)
+                return 1;
+
         for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) {
                 if (v->type != _SD_BUS_VTABLE_PROPERTY && v->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY)
                         continue;
 
+                if (v->flags & SD_BUS_VTABLE_HIDDEN)
+                        continue;
+
                 r = sd_bus_message_open_container(reply, 'e', "sv");
                 if (r < 0)
                         return r;
@@ -853,6 +859,9 @@ static int process_introspect(
 
                 empty = false;
 
+                if (c->vtable[0].flags & SD_BUS_VTABLE_HIDDEN)
+                        continue;
+
                 if (!streq_ptr(previous_interface, c->interface)) {
 
                         if (previous_interface)
@@ -1275,6 +1284,10 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
         if (hashmap_isempty(bus->nodes))
                 return 0;
 
+        /* Never respond to broadcast messages */
+        if (bus->bus_client && !m->destination)
+                return 0;
+
         assert(m->path);
         assert(m->member);
 
@@ -1325,7 +1338,8 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
 static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
         struct node *n, *parent;
         const char *e;
-        char *s, *p;
+        _cleanup_free_ char *s = NULL;
+        char *p;
         int r;
 
         assert(bus);
@@ -1353,10 +1367,8 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
                 p = strndupa(path, MAX(1, path - e));
 
                 parent = bus_node_allocate(bus, p);
-                if (!parent) {
-                        free(s);
+                if (!parent)
                         return NULL;
-                }
         }
 
         n = new0(struct node, 1);
@@ -1365,10 +1377,11 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
 
         n->parent = parent;
         n->path = s;
+        s = NULL; /* do not free */
 
         r = hashmap_put(bus->nodes, s, n);
         if (r < 0) {
-                free(s);
+                free(n->path);
                 free(n);
                 return NULL;
         }