[next] telepathy-glib: channel-introspect: pass an empty array as Interfaces prop

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Mon Mar 3 02:12:22 PST 2014


Module: telepathy-glib
Branch: next
Commit: 8853f55cf99ca399b28ea07419d3b4bf9a636b2c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=8853f55cf99ca399b28ea07419d3b4bf9a636b2c

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Feb 28 11:31:14 2014 +0100

channel-introspect: pass an empty array as Interfaces prop

g_variant_new_strv() isn't NULL friendly, making tp_asv_to_vardict() crash.

---

 tests/dbus/channel-introspect.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/dbus/channel-introspect.c b/tests/dbus/channel-introspect.c
index 01b63b3..58af4a5 100644
--- a/tests/dbus/channel-introspect.c
+++ b/tests/dbus/channel-introspect.c
@@ -118,6 +118,7 @@ main (int argc,
   GHashTable *asv;
   GAsyncResult *prepare_result;
   GQuark group_features[] = { TP_CHANNEL_FEATURE_GROUP, 0 };
+  const gchar * const empty[] = { NULL };
 
   tp_tests_abort_after (10);
   dbus = tp_tests_dbus_daemon_dup_or_die ();
@@ -227,7 +228,7 @@ main (int argc,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
       TP_PROP_CHANNEL_INITIATOR_HANDLE, G_TYPE_UINT, handle,
       TP_PROP_CHANNEL_INITIATOR_ID, G_TYPE_STRING, IDENTIFIER,
-      TP_PROP_CHANNEL_INTERFACES, G_TYPE_STRV, NULL,
+      TP_PROP_CHANNEL_INTERFACES, G_TYPE_STRV, empty,
       TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
       NULL);
 



More information about the telepathy-commits mailing list