Attachment 34687 Details for Bug 26394 – Make sure corresponding X drawable exists before trying to use it

[patch] Make sure corresponding X drawable exists before trying to use it

xserver-dri2-drawable-destroy-fix.patch (text/plain), 1.43 KB, created by Jesse Barnes on 2010-04-05 16:08:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2010-04-05 16:08:31 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/glx/glxcmds.c b/glx/glxcmds.c
>index 77afbf4..95a667a 100644
>--- a/glx/glxcmds.c
>+++ b/glx/glxcmds.c
>@@ -1086,6 +1086,7 @@ __glXDrawableInit(__GLXdrawable *drawable,
> 		  XID drawId, __GLXconfig *config)
> {
>     drawable->pDraw = pDraw;
>+    drawable->xDrawId = pDraw->id;
>     drawable->type = type;
>     drawable->drawId = drawId;
>     drawable->config = config;
>diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
>index 2a365c5..227bc95 100644
>--- a/glx/glxdrawable.h
>+++ b/glx/glxdrawable.h
>@@ -52,6 +52,7 @@ struct __GLXdrawable {
>     void      (*waitGL)(__GLXdrawable *);
> 
>     DrawablePtr pDraw;
>+    XID xDrawId;
>     XID drawId;
> 
>     /*
>diff --git a/glx/glxdri2.c b/glx/glxdri2.c
>index e791bf6..adfb18e 100644
>--- a/glx/glxdri2.c
>+++ b/glx/glxdri2.c
>@@ -102,12 +102,16 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
> {
>     __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
>     const __DRIcoreExtension *core = private->screen->core;
>-    
>+    DrawablePtr pDraw;
>+    int err;
>+
>     (*core->destroyDrawable)(private->driDrawable);
> 
>     /* If the X window was destroyed, the dri DestroyWindow hook will
>      * aready have taken care of this, so only call if pDraw isn't NULL. */
>-    if (drawable->pDraw != NULL)
>+    err = dixLookupDrawable(&pDraw, drawable->xDrawId, serverClient, 0,
>+			    DixWriteAccess);
>+    if (err == Success && pDraw)
> 	DRI2DestroyDrawable(drawable->pDraw);
> 
>     __glXDrawableRelease(drawable);

Actions: View | Splinter Review

Attachments on bug 26394: 33011 | 34041 | 34244 | 34628 | 34687 | 34730 | 35001 | 35002 | 35003 | 35004 | 35005 | 35006 | 35191 | 35195

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.