Attachment 63430 Details for Bug 51032 – dbus_pending_call_set_notify: don't leave the connection locked on OOM

[patch] dbus_pending_call_set_notify: don't leave the connection locked on OOM

0001-dbus_pending_call_set_notify-don-t-leave-the-connect.patch (text/plain), 1.44 KB, created by Simon McVittie on 2012-06-25 04:21:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-06-25 04:21:28 UTC

Size: 1.44 KB

patch

obsolete

>From b95ee7e7e6b89005284029365aef86e3fbc8743f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 25 Jun 2012 12:20:45 +0100
>Subject: [PATCH] dbus_pending_call_set_notify: don't leave the connection
> locked on OOM
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51032
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-pending-call.c |    8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
>index 8a9d2f4..62c6c74 100644
>--- a/dbus/dbus-pending-call.c
>+++ b/dbus/dbus-pending-call.c
>@@ -631,6 +631,8 @@ dbus_pending_call_set_notify (DBusPendingCall              *pending,
>                               void                         *user_data,
>                               DBusFreeFunction              free_user_data)
> {
>+  dbus_bool_t ret = FALSE;
>+
>   _dbus_return_val_if_fail (pending != NULL, FALSE);
> 
>   CONNECTION_LOCK (pending->connection);
>@@ -638,13 +640,15 @@ dbus_pending_call_set_notify (DBusPendingCall              *pending,
>   /* could invoke application code! */
>   if (!_dbus_pending_call_set_data_unlocked (pending, notify_user_data_slot,
>                                              user_data, free_user_data))
>-    return FALSE;
>+    goto out;
>   
>   pending->function = function;
>+  ret = TRUE;
> 
>+out:
>   CONNECTION_UNLOCK (pending->connection);
>   
>-  return TRUE;
>+  return ret;
> }
> 
> /**
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 51032: 63430

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.