Attachment 15991 Details for Bug 15571 – Patch to correct the problem

[patch] Patch to correct the problem

dbus-1.1.20-shared-connections-shutdown.patch (text/plain), 1.29 KB, created by Scott James Remnant on 2008-04-17 16:06:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott James Remnant

Created: 2008-04-17 16:06:07 UTC

Size: 1.29 KB

patch

obsolete

>Binary files dbus-1.1.20~/dbus/.dbus-connection.c.swp and dbus-1.1.20/dbus/.dbus-connection.c.swp differ
>diff -ruNp dbus-1.1.20~/dbus/dbus-connection.c dbus-1.1.20/dbus/dbus-connection.c
>--- dbus-1.1.20~/dbus/dbus-connection.c	2008-02-26 16:02:27.000000000 +0000
>+++ dbus-1.1.20/dbus/dbus-connection.c	2008-04-17 23:59:35.000000000 +0100
>@@ -1671,21 +1671,26 @@ connection_forget_shared_unlocked (DBusC
>   if (!connection->shareable)
>     return;
>   
>+  _DBUS_LOCK (shared_connections);
>+      
>   if (connection->server_guid != NULL)
>     {
>       _dbus_verbose ("dropping connection to %s out of the shared table\n",
>                      connection->server_guid);
>       
>-      _DBUS_LOCK (shared_connections);
>-      
>       if (!_dbus_hash_table_remove_string (shared_connections,
>                                            connection->server_guid))
>         _dbus_assert_not_reached ("connection was not in the shared table");
>       
>       dbus_free (connection->server_guid);
>       connection->server_guid = NULL;
>-      _DBUS_UNLOCK (shared_connections);
>     }
>+  else
>+    {
>+      _dbus_list_remove (&shared_connections_no_guid, connection);
>+    }
>+
>+  _DBUS_UNLOCK (shared_connections);
>   
>   /* remove our reference held on all shareable connections */
>   _dbus_connection_unref_unlocked (connection);

Actions: View | Splinter Review

Attachments on bug 15571: 15991 | 16156

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.