Attachment 94878 Details for Bug 55109 – channel-introspect: pass an empty array as Interfaces prop

[patch] channel-introspect: pass an empty array as Interfaces prop

0005-channel-introspect-pass-an-empty-array-as-Interfaces.patch (text/plain), 1.27 KB, created by Guillaume Desmottes on 2014-02-28 11:22:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-02-28 11:22:21 UTC

Size: 1.27 KB

patch

obsolete

>From 5a514f5862b6418e11bb89ccd9bd5739494076b6 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Fri, 28 Feb 2014 11:31:14 +0100
>Subject: [PATCH 5/6] 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);
> 
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 55109: 94874 | 94875 | 94876 | 94877 | 94878 | 94879

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.