bus: fix memory leak when kdbus is not enabled

[elogind.git] / src / libsystemd / sd-bus / bus-control.c

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index 846307d6647d1f23d94804efba66b5f067103d96..db0c11b0fe4811a0631cc64238a6aead1a4d5bc3 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -237,11 +237,9 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
                         if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0)
                                 return -ENOMEM;
 
-                        r = strv_push(x, n);
-                        if (r < 0) {
-                                free(n);
-                                return -ENOMEM;
-                        }
+                        r = strv_consume(x, n);
+                        if (r < 0)
+                                return r;
 
                         previous_id = name->owner_id;
                 }
@@ -687,8 +685,8 @@ static int bus_get_owner_dbus1(
                 }
 
                 if (mask & SD_BUS_CREDS_SELINUX_CONTEXT) {
-                        const void *p;
-                        size_t sz;
+                        const void *p = NULL;
+                        size_t sz = 0;
 
                         r = sd_bus_call_method(
                                         bus,
@@ -1207,10 +1205,11 @@ _public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128
 
         r = sd_bus_message_new_method_call(
                         bus,
+                        &m,
                         name,
                         "/",
                         "org.freedesktop.DBus.Peer",
-                        "GetMachineId", &m);
+                        "GetMachineId");
         if (r < 0)
                 return r;