From af8601fa8b035426bba7916ebe08e4568d2e2cbd Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 21 Oct 2013 00:18:00 +0200 Subject: bus: allow to specify NULL as an empty string to add --- src/libsystemd-bus/bus-objects.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/libsystemd-bus') diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index 0c935e947d..90417fdca1 100644 --- a/src/libsystemd-bus/bus-objects.c +++ b/src/libsystemd-bus/bus-objects.c @@ -313,7 +313,7 @@ static int invoke_property_get( void *userdata) { int r; - void *p; + const void *p; assert(bus); assert(v); @@ -333,6 +333,11 @@ static int invoke_property_get( switch (v->x.property.signature[0]) { case SD_BUS_TYPE_STRING: + p = *(char**) userdata; + if (!p) + p = ""; + break; + case SD_BUS_TYPE_OBJECT_PATH: case SD_BUS_TYPE_SIGNATURE: p = *(char**) userdata; -- cgit v1.2.3-54-g00ecf