sd-bus: fix transition left-overs in sd_bus_get_owner_creds()

sd_bus_get_owner_creds() was only halfly ported over to
_cleanup_bus_creds_unref_.
This commit is contained in:
Daniel Mack
2014-10-22 22:06:53 +02:00
parent 3bfd4e0c63
commit 505e77caa5
+3 -6
View File
@@ -826,10 +826,8 @@ _public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **r
if (!isempty(bus->label) && (mask & SD_BUS_CREDS_SELINUX_CONTEXT)) {
c->label = strdup(bus->label);
if (!c->label) {
sd_bus_creds_unref(c);
if (!c->label)
return -ENOMEM;
}
c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT;
}
@@ -852,13 +850,12 @@ _public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **r
return r;
} else {
r = bus_creds_add_more(c, mask, pid, 0);
if (r < 0) {
sd_bus_creds_unref(c);
if (r < 0)
return r;
}
}
*ret = c;
c = NULL;
return 0;
}