- check for null

diff --git a/dbus/DBusMessage.cc b/dbus/DBusMessage.cc
index b3b3bb72953c932e8e7707e6c031ff4a84bebb2d..a85644830a7daef6710bfe5aac2d17d82a91b2c6 100644 (file)
--- a/dbus/DBusMessage.cc
+++ b/dbus/DBusMessage.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012 Novell, Inc.
- * Copyright (c) [2016-2025] SUSE LLC
+ * Copyright (c) [2016-2026] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -65,6 +65,46 @@ namespace DBus
     }
 
 
+    string
+    Message::get_member() const
+    {
+       const char* member = dbus_message_get_member(msg);
+       return member ? member : "";
+    }
+
+
+    string
+    Message::get_sender() const
+    {
+       const char* sender = dbus_message_get_sender(msg);
+       return sender ? sender : "";
+    }
+
+
+    string
+    Message::get_path() const
+    {
+       const char* path = dbus_message_get_path(msg);
+       return path ? path : "";
+    }
+
+
+    string
+    Message::get_interface() const
+    {
+       const char* interface = dbus_message_get_interface(msg);
+       return interface ? interface : "";
+    }
+
+
+    string
+    Message::get_error_name() const
+    {
+       const char* error_name = dbus_message_get_error_name(msg);
+       return error_name ? error_name : "";
+    }
+
+
     const char* TypeInfo<dbus_int32_t>::signature = "i";
     const char* TypeInfo<dbus_uint32_t>::signature = "u";
     const char* TypeInfo<dbus_uint64_t>::signature = "t";

diff --git a/dbus/DBusMessage.h b/dbus/DBusMessage.h
index 97c5424c89d7a8fd0010796f6da4d78db80d2af8..33cf0fb12f55324d58a9725854ac3812af0d66d0 100644 (file)
--- a/dbus/DBusMessage.h
+++ b/dbus/DBusMessage.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012 Novell, Inc.
- * Copyright (c) [2016-2025] SUSE LLC
+ * Copyright (c) [2016-2026] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -93,11 +93,12 @@ namespace DBus
        DBusMessage* get_message() { return msg; }
 
        int get_type() const { return dbus_message_get_type(msg); }
-       string get_member() const { return dbus_message_get_member(msg); }
-       string get_sender() const { return dbus_message_get_sender(msg); }
-       string get_path() const { return dbus_message_get_path(msg); }
-       string get_interface() const { return dbus_message_get_interface(msg); }
-       string get_error_name() const { return dbus_message_get_error_name(msg); }
+
+       string get_member() const;
+       string get_sender() const;
+       string get_path() const;
+       string get_interface() const;
+       string get_error_name() const;
 
        bool is_method_call(const char* interface, const char* method) const
        {