2005-06-16 Colin Walters <walters@verbum.org>

	* glib/dbus-gvalue.c (marshal_basic): Marshal NULL string
	values as the empty string (#2948).

diff --git a/ChangeLog b/ChangeLog
index d288906..5b1f8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-16  Colin Walters  <walters@verbum.org>
 
+       * glib/dbus-gvalue.c (marshal_basic): Marshal NULL string
+       values as the empty string (#2948).
+       
+2005-06-16  Colin Walters  <walters@verbum.org>
+
        * dbus/Makefile.am:
        * mono/doc/Makefile.am:
        * test/glib/Makefile.am:

diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c
index 87ba229..ee2cfda 100644 (file)
--- a/glib/dbus-gvalue.c
+++ b/glib/dbus-gvalue.c
@@ -1275,6 +1275,8 @@ marshal_basic (DBusMessageIter *iter, GValue *value)
       /* FIXME, the GValue string may not be valid UTF-8 */
       {
         const char *v = g_value_get_string (value);
+       if (!v)
+         v = "";
         if (!dbus_message_iter_append_basic (iter,
                                              DBUS_TYPE_STRING,
                                              &v))