Attachment 46318 Details for Bug 36811 – [PATCH 3/5] dbus_g_connection_register_g_object: only hook onto signals on first use

[patch] [PATCH 3/5] dbus_g_connection_register_g_object: only hook onto signals on first use

0003-dbus_g_connection_register_g_object-only-hook-onto-s.patch (text/plain), 3.63 KB, created by Simon McVittie on 2011-05-04 05:08:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-04 05:08:01 UTC

Size: 3.63 KB

patch

obsolete

>From f45338404e8c5f879f5f5922cc8d0ae1578c08a3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 May 2011 12:24:35 +0100
>Subject: [PATCH 3/5] dbus_g_connection_register_g_object: only hook onto
> signals on first use
>
>This fixes a bug in which an empty list of registrations was considered
>to be synonymous with the object never having been exported, resulting
>in this failure mode:
>
>* register object at n locations
>  - the first time, export_signals() is called
>* unregister all of those locations
>* register object at a new location
>  - export_signals() is wrongly called again
>* emit a signal
>  - the D-Bus signal gets emitted twice
>---
> dbus/dbus-gobject.c |   48 ++++++++++++++++--------------------------------
> 1 files changed, 16 insertions(+), 32 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 3a038ab..4cd762b 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -2554,10 +2554,8 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>                                      GObject               *object)
> {
>   ObjectExport *oe;
>-  GList *info_list;
>   GSList *iter;
>   ObjectRegistration *o;
>-  gboolean is_first_registration;
> 
>   g_return_if_fail (connection != NULL);
>   g_return_if_fail (g_variant_is_object_path (at_path));
>@@ -2567,6 +2565,22 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
> 
>   if (oe == NULL)
>     {
>+      GList *info_list = lookup_object_info (object);
>+
>+      if (info_list == NULL)
>+        {
>+          g_warning ("No introspection data registered for object class \"%s\"",
>+                     g_type_name (G_TYPE_FROM_INSTANCE (object)));
>+          return;
>+        }
>+
>+      /* This adds a hook into every signal for the object.  Only do this
>+       * on the first registration, because inside the signal marshaller
>+       * we emit a signal for each registration.
>+       */
>+      export_signals (info_list, object);
>+      g_list_free (info_list);
>+
>       oe = object_export_new ();
>       g_object_set_data_full (object, "dbus_glib_object_registrations", oe,
>           (GDestroyNotify) object_export_free);
>@@ -2581,25 +2595,6 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>         return;
>     }
> 
>-  is_first_registration = (oe->registrations == NULL);
>-
>-  /* This is used to hook up signals below, but we do this check
>-   * before trying to register the object to make sure we have
>-   * introspection data for it.
>-   */
>-  if (is_first_registration)
>-    {
>-      info_list = lookup_object_info (object);
>-      if (info_list == NULL)
>-        {
>-          g_warning ("No introspection data registered for object class \"%s\"",
>-                     g_type_name (G_TYPE_FROM_INSTANCE (object)));
>-          return;
>-        }
>-    }
>-  else
>-    info_list = NULL;
>-
>   o = object_registration_new (connection, at_path, object);
> 
>   if (!dbus_connection_register_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (connection),
>@@ -2609,20 +2604,9 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>     {
>       g_error ("Failed to register GObject with DBusConnection");
>       object_registration_free (o);
>-      g_list_free (info_list);
>       return;
>     }
> 
>-  if (is_first_registration)
>-    {
>-      /* This adds a hook into every signal for the object.  Only do this
>-       * on the first registration, because inside the signal marshaller
>-       * we emit a signal for each registration.
>-       */
>-      export_signals (info_list, object);
>-      g_list_free (info_list);
>-    }
>-
>   oe->registrations = g_slist_append (oe->registrations, o);
> }
> 
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 36811: 46316 | 46317 | 46318 | 46319 | 46320 | 46538

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.