Attachment 15588 Details for Bug 15293 – Patch ungrabbing on all code paths

[patch] Patch ungrabbing on all code paths

dbus-stuck-grab.patch (text/plain), 1.57 KB, created by Owen Taylor on 2008-03-31 14:23:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2008-03-31 14:23:07 UTC

Size: 1.57 KB

patch

obsolete

>commit e02f2b619524d5ef306b636e96dce113189d7b48
>Author: Owen W. Taylor <otaylor@fishsoup.net>
>Date:   Mon Mar 31 17:19:32 2008 -0400
>
>    Prevent stuck grabs when failing to set X11 address.
>    Whenever we ungrab the server, especially if we aren't going
>    to run a mainloop afterwards, XFlush() after ungrabbing.
>
>diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c
>index 927d863..442e9ba 100644
>--- a/tools/dbus-launch-x11.c
>+++ b/tools/dbus-launch-x11.c
>@@ -341,7 +341,7 @@ static Window
> set_address_in_x11(char *address, pid_t pid)
> {
>   char *current_address;
>-  Window wid;
>+  Window wid = None;
>   unsigned long pid32; /* Xlib property functions want _long_ not 32-bit for format "32" */
>   
>   /* lock the X11 display to make sure we're doing this atomically */
>@@ -350,16 +350,14 @@ set_address_in_x11(char *address, pid_t pid)
>   if (!x11_get_address (&current_address, NULL, NULL))
>     {
>       /* error! */
>-      XUngrabServer (xdisplay);
>-      return None;
>+      goto out;
>     }
> 
>   if (current_address != NULL)
>     {
>       /* someone saved the address in the meantime */
>-      XUngrabServer (xdisplay);
>       free (current_address);
>-      return None;
>+      goto out;
>     }
> 
>   /* Create our window */
>@@ -378,9 +376,11 @@ set_address_in_x11(char *address, pid_t pid)
>   /* Now grab the selection */
>   XSetSelectionOwner (xdisplay, selection_atom, wid, CurrentTime);
> 
>+ out:
>   /* Ungrab the server to let other people use it too */
>   XUngrabServer (xdisplay);
> 
>+  /* And make sure that the ungrab gets sent to X11 */
>   XFlush (xdisplay);
> 
>   return wid;

Actions: View | Splinter Review

Attachments on bug 15293: 15588 | 15589

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.