1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00

detect_virtualization() returns NULL; pass empty string to dbus

This commit is contained in:
Kay Sievers 2013-11-02 00:01:32 +01:00
parent cc27380c1e
commit 98e6c5e62f

View File

@ -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) { static int bus_manager_append_virt(DBusMessageIter *i, const char *property, void *data) {
Manager *m = data; Manager *m = data;
const char *id = ""; const char *id = NULL;
assert(i); assert(i);
assert(property); assert(property);
@ -474,6 +474,8 @@ static int bus_manager_append_virt(DBusMessageIter *i, const char *property, voi
detect_virtualization(&id); detect_virtualization(&id);
if (!id)
id = "";
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id)) if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
return -ENOMEM; return -ENOMEM;