Attachment 29195 Details for Bug 23690 – 0001-_XAllocID-don-t-assert-when-running-out-of-IDs-23690.patch

[patch] 0001-_XAllocID-don-t-assert-when-running-out-of-IDs-23690.patch

0001-_XAllocID-don-t-assert-when-running-out-of-IDs-23690.patch (text/plain), 1.04 KB, created by Peter Hutterer on 2009-09-03 16:43:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2009-09-03 16:43:19 UTC

Size: 1.04 KB

patch

obsolete

>From 1415d592830034373a9ff4628588023b2e9d28e4 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Fri, 4 Sep 2009 09:32:31 +1000
>Subject: [PATCH] _XAllocID: don't assert when running out of IDs (#23690)
>
>xcb_generate_id returns -1 when the ID range for this client is exhausted.
>On the next call to _XAllocID, the assert triggers and the client dies.
>Skipping the assert returns an ID of ~0UL to the client and the client can
>gracefully handle the BadIDChoice error from the server.
>
>X.Org Bug 23690 <http://bugs.freedesktop.org/show_bug.cgi?id=23690>
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> src/xcb_io.c |    1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
>diff --git a/src/xcb_io.c b/src/xcb_io.c
>index 4f0159c..2343ee6 100644
>--- a/src/xcb_io.c
>+++ b/src/xcb_io.c
>@@ -375,7 +375,6 @@ int _XIDHandler(Display *dpy)
> XID _XAllocID(Display *dpy)
> {
> 	XID ret = dpy->xcb->next_xid;
>-	assert (ret != inval_id);
> #ifdef XTHREADS
> 	if (dpy->lock)
> 		(*dpy->lock->user_lock_display)(dpy);
>-- 
>1.6.3.rc1.2.g0164.dirty
>

Actions: View | Splinter Review

Attachments on bug 23690: 29195

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.