From 3220372584bf346507c00a9445374cc2f1dd6ad0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 16 Jun 2005 04:38:11 +0000 Subject: 2005-06-16 Colin Walters * glib/dbus-gvalue.c (marshal_basic): Marshal NULL string values as the empty string (#2948). --- ChangeLog | 5 +++++ glib/dbus-gvalue.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index d288906a..5b1f8df1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-16 Colin Walters + + * glib/dbus-gvalue.c (marshal_basic): Marshal NULL string + values as the empty string (#2948). + 2005-06-16 Colin Walters * dbus/Makefile.am: diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c index 87ba229d..ee2cfda1 100644 --- 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)) -- cgit