summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-10-22 12:40:54 +0100
committerLennart Poettering <lennart@poettering.net>2013-10-22 12:41:54 +0100
commit28d6633ae11fa0747a4bfa09effe839a91b6d5e4 (patch)
treeb192426ce0a874399e4a5b5341d87d0f0375d377
parent430fb8fab261e9661ccf3109b0a92cc9a34801b3 (diff)
bus: NULL signatures are OK too
-rw-r--r--src/libsystemd-bus/bus-objects.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index 90417fdca1..c852ad6c42 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -333,14 +333,13 @@ static int invoke_property_get(
switch (v->x.property.signature[0]) {
case SD_BUS_TYPE_STRING:
- p = *(char**) userdata;
- if (!p)
- p = "";
+ case SD_BUS_TYPE_SIGNATURE:
+ p = strempty(*(char**) userdata);
break;
case SD_BUS_TYPE_OBJECT_PATH:
- case SD_BUS_TYPE_SIGNATURE:
p = *(char**) userdata;
+ assert(p);
break;
default: