Attachment 44963 Details for Bug 30171 – dbus_g_proxy_marshal_args_to_message: diagnose inability to marshal args

[patch] dbus_g_proxy_marshal_args_to_message: diagnose inability to marshal args

0020-dbus_g_proxy_marshal_args_to_message-diagnose-inabil.patch (text/plain), 1.58 KB, created by Simon McVittie on 2011-03-28 11:21:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-03-28 11:21:18 UTC

Size: 1.58 KB

patch

obsolete

>From 6557deeed871651d6a7f395e74808355979cf9cd Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Mar 2011 17:30:29 +0100
>Subject: [PATCH 20/25] dbus_g_proxy_marshal_args_to_message: diagnose inability to marshal args
>
>Failure to marshal arguments is entirely reachable, albeit only via
>programming error.
>---
> dbus/dbus-gproxy.c |   16 ++++++++++++----
> 1 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
>index 3270618..8c2034f 100644
>--- a/dbus/dbus-gproxy.c
>+++ b/dbus/dbus-gproxy.c
>@@ -2166,7 +2166,7 @@ dbus_g_proxy_marshal_args_to_message (DBusGProxy  *proxy,
>                                           priv->interface,
>                                           method);
>   if (message == NULL)
>-    goto oom;
>+    return NULL;
> 
>   dbus_message_iter_init_append (message, &msgiter);
>   for (i = 0; i < args->n_values; i++)
>@@ -2176,11 +2176,19 @@ dbus_g_proxy_marshal_args_to_message (DBusGProxy  *proxy,
>       gvalue = g_value_array_get_nth (args, i);
> 
>       if (!_dbus_gvalue_marshal (&msgiter, gvalue))
>-	g_assert_not_reached ();
>+        {
>+          /* This is a programming error by the caller, most likely */
>+          gchar *contents = g_strdup_value_contents (gvalue);
>+
>+          g_critical ("Could not marshal argument %u for %s: type %s, value %s",
>+              i, method, G_VALUE_TYPE_NAME (gvalue), contents);
>+          g_free (contents);
>+          dbus_message_unref (message);
>+          return NULL;
>+        }
>     }
>+
>   return message;
>- oom:
>-  return NULL;
> }
> 
> static guint
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 30171: 44943 | 44944 | 44945 | 44946 | 44947 | 44948 | 44949 | 44950 | 44951 | 44952 | 44953 | 44954 | 44955 | 44956 | 44957 | 44958 | 44959 | 44960 | 44961 | 44962 | 44963 | 44964 | 44965 | 44966 | 44967 | 44968

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.