From: Kay Sievers <kay@vrfy.org>
Date: Fri, 1 Nov 2013 23:01:32 +0000 (+0100)
Subject: detect_virtualization() returns NULL; pass empty string to dbus
X-Git-Tag: v209~1680
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=98e6c5e62ffcec33bd5255ebaafeafdc5a3f1ada

detect_virtualization() returns NULL; pass empty string to dbus
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 46f55d088..b47fc8510 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -466,7 +466,7 @@ static int bus_manager_append_progress(DBusMessageIter *i, const char *property,
 
 static int bus_manager_append_virt(DBusMessageIter *i, const char *property, void *data) {
         Manager *m = data;
-        const char *id = "";
+        const char *id = NULL;
 
         assert(i);
         assert(property);
@@ -474,6 +474,8 @@ static int bus_manager_append_virt(DBusMessageIter *i, const char *property, voi
 
         detect_virtualization(&id);
 
+        if (!id)
+                id = "";
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
                 return -ENOMEM;