if NULL is passed for a string, then write the empty string to the wire

1 files changed, 6 insertions, 0 deletions

diff --git a/src/eggdbus/eggdbusmessage.c b/src/eggdbus/eggdbusmessage.c
index 3ec6c61..51631d3 100644
--- a/src/eggdbus/eggdbusmessage.c
+++ b/src/eggdbus/eggdbusmessage.c
@@ -2618,16 +2618,22 @@ egg_dbus_append_value_to_iter (DBusMessageIter              *iter,
   if (strcmp (signature, DBUS_TYPE_STRING_AS_STRING) == 0)
     {
       const char *val = g_value_get_string (value);
+      if (val == NULL)
+        val = "";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &val);
     }
   else if (strcmp (signature, DBUS_TYPE_OBJECT_PATH_AS_STRING) == 0)
     {
       const char *val = g_value_get_boxed (value);
+      if (val == NULL)
+        val = "";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_OBJECT_PATH, &val);
     }
   else if (strcmp (signature, DBUS_TYPE_SIGNATURE_AS_STRING) == 0)
     {
       const char *val = g_value_get_boxed (value);
+      if (val == NULL)
+        val = "";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_SIGNATURE, &val);
     }
   else if (strcmp (signature, DBUS_TYPE_BYTE_AS_STRING) == 0)