Attachment 38289 Details for Bug 29884 – Assert that marshalling in dbus_g_method_return succeeded

[patch] Assert that marshalling in dbus_g_method_return succeeded

0002-Assert-that-marshalling-in-dbus_g_method_return-succe.diff (text/plain), 1.06 KB, created by Kristian Rietveld on 2010-08-30 04:01:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Rietveld

Created: 2010-08-30 04:01:43 UTC

Size: 1.06 KB

patch

obsolete

>>From 29435381e7af81d989599630d94c004acf532a40 Mon Sep 17 00:00:00 2001
>From: Christian Dywan <christian.dywan@lanedo.com>
>Date: Wed, 21 Jul 2010 16:53:49 +0200
>Subject: Assert that marshalling in dbus_g_method_return succeeded
>
>---
> dbus/dbus-gobject.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 3e7914d..877518c 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -2702,6 +2702,7 @@ dbus_g_method_return (DBusGMethodInvocation *context, ...)
>     {
>       GValue value = {0,};
>       char *error;
>+      gboolean marshalled;
>       g_value_init (&value, g_array_index (argsig, GType, i));
>       error = NULL;
>       G_VALUE_COLLECT (&value, args, G_VALUE_NOCOPY_CONTENTS, &error);
>@@ -2710,7 +2711,8 @@ dbus_g_method_return (DBusGMethodInvocation *context, ...)
> 	  g_warning("%s", error);
> 	  g_free (error);
> 	}
>-      _dbus_gvalue_marshal (&iter, &value);
>+      marshalled = _dbus_gvalue_marshal (&iter, &value);
>+      g_assert (marshalled);
>     }
>   va_end (args);
> 
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 29884: 38288 | 38289 | 38290 | 41068 | 41069 | 41622

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.