Attachment 17862 Details for Bug 16841 – [PATCH 1/9] Make sure a pending call timeout isn't assumed.

[patch] [PATCH 1/9] Make sure a pending call timeout isn't assumed.

001.patch (text/plain), 2.67 KB, created by Colin Walters on 2008-07-24 14:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-07-24 14:20:05 UTC

Size: 2.67 KB

patch

obsolete

>* dbus/dbus-connection.c (_dbus_connection_attach_pending_call_unlocked):
>  Don't assume that the pending call has a timeout.
>  (connection_timeout_and_complete_all_pending_call_unlocked): check that
>  the timeout was actually added before removing it; this safeguards us
>  if the pending call doesn't have a timeout.
>---
> dbus/dbus-connection.c |   33 +++++++++++++++++++--------------
> 1 files changed, 19 insertions(+), 14 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index a960a99..89ab73a 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -883,21 +883,24 @@ _dbus_connection_attach_pending_call_unlocked (DBusConnection  *connection,
> 
>   timeout = _dbus_pending_call_get_timeout_unlocked (pending);
> 
>-  if (!_dbus_connection_add_timeout_unlocked (connection, timeout))
>-    return FALSE;
>-  
>-  if (!_dbus_hash_table_insert_int (connection->pending_replies,
>-                                    reply_serial,
>-                                    pending))
>+  if (timeout)
>     {
>-      _dbus_connection_remove_timeout_unlocked (connection, timeout);
>+      if (!_dbus_connection_add_timeout_unlocked (connection, timeout))
>+        return FALSE;
>+      
>+      if (!_dbus_hash_table_insert_int (connection->pending_replies,
>+                                        reply_serial,
>+                                        pending))
>+        {
>+          _dbus_connection_remove_timeout_unlocked (connection, timeout);
> 
>-      _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE);
>-      HAVE_LOCK_CHECK (connection);
>-      return FALSE;
>+          _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE);
>+          HAVE_LOCK_CHECK (connection);
>+          return FALSE;
>+        }
>+      
>+      _dbus_pending_call_set_timeout_added_unlocked (pending, TRUE);
>     }
>-  
>-  _dbus_pending_call_set_timeout_added_unlocked (pending, TRUE);
> 
>   _dbus_pending_call_ref_unlocked (pending);
> 
>@@ -2188,8 +2191,10 @@ connection_timeout_and_complete_all_pending_calls_unlocked (DBusConnection *conn
>        
>       _dbus_pending_call_queue_timeout_error_unlocked (pending, 
>                                                        connection);
>-      _dbus_connection_remove_timeout_unlocked (connection,
>-                                                _dbus_pending_call_get_timeout_unlocked (pending));
>+
>+      if (_dbus_pending_call_is_timeout_added_unlocked (pending))
>+          _dbus_connection_remove_timeout_unlocked (connection,
>+                                                    _dbus_pending_call_get_timeout_unlocked (pending));
>       _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE);       
>       _dbus_hash_iter_remove_entry (&iter);

Actions: View | Splinter Review

Attachments on bug 16841: 17862 | 17863 | 17864 | 17865 | 17866 | 17867 | 17868 | 17869 | 17870 | 25769 | 25770 | 25771 | 25772 | 25773 | 25774 | 25775 | 25776 | 25777 | 25778 | 25779

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.