summaryrefslogtreecommitdiffstats
path: root/glib
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-06-16 04:38:11 +0000
committerColin Walters <walters@verbum.org>2005-06-16 04:38:11 +0000
commit3220372584bf346507c00a9445374cc2f1dd6ad0 (patch)
tree5c42bd0aa5cfef68bbe346789b29842ea90df0a1 /glib
parent6fe36d8791a66ce9415b845c5152ca2b5ec87195 (diff)
2005-06-16 Colin Walters <walters@verbum.org>
* glib/dbus-gvalue.c (marshal_basic): Marshal NULL string values as the empty string (#2948).
Diffstat (limited to 'glib')
-rw-r--r--glib/dbus-gvalue.c2
1 files changed, 2 insertions, 0 deletions
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))