Attachment 48093 Details for Bug 38406 – [PATCH 1/5] DBusGProxy: cope gracefully with call_id == 0

[patch] [PATCH 1/5] DBusGProxy: cope gracefully with call_id == 0

0001-DBusGProxy-cope-gracefully-with-call_id-0.patch (text/plain), 2.01 KB, created by Simon McVittie on 2011-06-17 06:44:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-17 06:44:31 UTC

Size: 2.01 KB

patch

obsolete

>From 3240393f5126e70d60d444054245681479c5d535 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 17 Jun 2011 12:06:11 +0100
>Subject: [PATCH 1/5] DBusGProxy: cope gracefully with call_id == 0
>
>As well as happening on a programming error or OOM (which both provoke
>critical warnings), dbus_g_proxy_begin_call_internal() can legitimately
>fail if we got disconnected from D-Bus (so can't send any more), but are
>still working through our backlog of incoming messages (so we haven't
>got round to the Disconnected message yet, so the DBusGProxy hasn't
>emitted ::destroy).
>
>fd.o #12675 fixed dbus_g_proxy_call(), but dbus_g_proxy_call_with_timeout()
>and the asynchronous API still need similar treatment.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
>---
> dbus/dbus-gproxy.c |   16 ++++++++++++++++
> 1 files changed, 16 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
>index 83fe8b9..ea0c311 100644
>--- a/dbus/dbus-gproxy.c
>+++ b/dbus/dbus-gproxy.c
>@@ -2332,6 +2332,16 @@ dbus_g_proxy_end_call_internal (DBusGProxy        *proxy,
>   DBusPendingCall *pending;
>   DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
> 
>+  if (call_id == 0)
>+    {
>+      /* Being disconnected is the only reason this can happen, except
>+       * for programmer error; if it was programmer error, we already
>+       * emitted a critical warning. */
>+      g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED,
>+          "Disconnected from D-Bus (or argument error during call)");
>+      return FALSE;
>+    }
>+
>   reply = NULL;
>   ret = FALSE;
>   n_retvals_processed = 0;
>@@ -2836,6 +2846,12 @@ dbus_g_proxy_cancel_call (DBusGProxy        *proxy,
> 
>   call_id = DBUS_G_PROXY_CALL_TO_ID (call);
> 
>+  if (call_id == 0)
>+    {
>+      /* nothing to cancel */
>+      return;
>+    }
>+
>   pending = g_hash_table_lookup (priv->pending_calls, GUINT_TO_POINTER (call_id));
>   g_hash_table_remove (priv->pending_calls, GUINT_TO_POINTER (call_id));
>   g_return_if_fail (pending != NULL);
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 38406: 48093 | 48094 | 48095 | 48096 | 48097

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.