bus: zero data structure and catch up with error value change

diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 6105a020701ee0c2c90c511d2590563b0c79ffb8..b2d98c05d70c74b11690f7bd241886f77ef4b1e5 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -475,6 +475,7 @@ int bus_kernel_create(const char *name, char **s) {
 
         l = strlen(name);
         make = alloca(offsetof(struct kdbus_cmd_bus_make, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1);
+        memset(make, 0, offsetof(struct kdbus_cmd_bus_make, name));
         sprintf(make->name, "%lu-%s", (unsigned long) getuid(), name);
         make->size = offsetof(struct kdbus_cmd_bus_make, name) + strlen(make->name) + 1;
         make->flags = KDBUS_ACCESS_WORLD | KDBUS_POLICY_OPEN;

diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index af82466b369341b83b4214c2a516e1e9d287df01..2164daf6908e0bd20d753b534922fb2f20b33973 100644 (file)
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) {
         assert_se(r >= 0);
 
         r = sd_bus_release_name(a, "net.x0pointer.foobar");
-        assert_se(r == -ENXIO);
+        assert_se(r == -ESRCH);
 
         sd_bus_unref(a);
         sd_bus_unref(b);