From: Kay Sievers <kay@vrfy.org>
Date: Sun, 20 Oct 2013 22:18:00 +0000 (+0200)
Subject: bus: allow to specify NULL as an empty string to add
X-Git-Tag: v209~1810
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=af8601fa8b035426bba7916ebe08e4568d2e2cbd

bus: allow to specify NULL as an empty string to add
---

diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index 0c935e947..90417fdca 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;