summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-05-15 23:27:59 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-05-16 18:03:00 -0400
commit2915234da0c9f2f8727d91f04857e7b72d6721a9 (patch)
treec6a2a74395050ad3ec07cbc86408f06eedbd2aee
parentee9b9875fd7e0ed6fbab3532944abf4c73353e42 (diff)
downloadsystemd-2915234da0c9f2f8727d91f04857e7b72d6721a9.tar.gz
bus: fix unitialized variable access in error path
-rw-r--r--src/libsystemd/sd-bus/bus-objects.c2
-rw-r--r--src/libsystemd/sd-bus/sd-bus.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 51d4a62cee..dbb04e5ec6 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -1602,7 +1602,7 @@ static int add_object_vtable_internal(
sd_bus_object_find_t find,
void *userdata) {
- sd_bus_slot *s;
+ sd_bus_slot *s = NULL;
struct node_vtable *i, *existing = NULL;
const sd_bus_vtable *v;
struct node *n;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index ec2843ff73..1f1a4d3a14 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -2821,7 +2821,7 @@ _public_ int sd_bus_add_match(
struct bus_match_component *components = NULL;
unsigned n_components = 0;
- sd_bus_slot *s;
+ sd_bus_slot *s = NULL;
int r = 0;
assert_return(bus, -EINVAL);