From 01085f24b31610e019adde1590103837be6c99e1 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 26 Jul 2018 21:45:50 +0200 Subject: [PATCH] Allow DBusMessage sender and destination values to be empty ref T291 --- src/xswiftbus/dbusmessage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xswiftbus/dbusmessage.cpp b/src/xswiftbus/dbusmessage.cpp index f036e2c8b..29371b4f0 100644 --- a/src/xswiftbus/dbusmessage.cpp +++ b/src/xswiftbus/dbusmessage.cpp @@ -55,7 +55,7 @@ namespace XSwiftBus { const char *sender = nullptr; sender = dbus_message_get_sender(m_message); - return std::string(sender); + return sender ? std::string(sender) : std::string(); } dbus_uint32_t CDBusMessage::getSerial() const @@ -244,7 +244,7 @@ namespace XSwiftBus { DBusMessage *reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); dbus_message_set_no_reply(reply, TRUE); - dbus_message_set_destination(reply, destination.c_str()); + if (! destination.empty()) { dbus_message_set_destination(reply, destination.c_str()); } dbus_message_set_reply_serial(reply, serial); CDBusMessage msg(reply); dbus_message_unref(reply);