andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glx: Free DRI2 drawable reference to destroyed GLX drawable.

Browse Source 
Otherwise the reference can lead to use after free in
__glXDRIinvalidateBuffers().

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50019

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2012-07-12 13:16:37 +02:00 committed by Keith Packard
parent 8a87acc9e5
commit a2d0829531
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glx/glxdri2.c
View File

@ -106,6 +106,7 @@ struct __GLXDRIdrawable {
int height;
__DRIbuffer buffers[MAX_DRAWABLE_BUFFERS];
int count;
XID dri2_id;
};
static void
@ -114,6 +115,8 @@ __glXDRIdrawableDestroy(__GLXdrawable * drawable)
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
const __DRIcoreExtension *core = private->screen->core;
FreeResource(private->dri2_id, FALSE);
(*core->destroyDrawable) (private->driDrawable);
__glXDrawableRelease(drawable);
@ -670,8 +673,9 @@ __glXDRIscreenCreateDrawable(ClientPtr client,
private->base.waitGL = __glXDRIdrawableWaitGL;
private->base.waitX = __glXDRIdrawableWaitX;
if (DRI2CreateDrawable(client, pDraw, drawId,
__glXDRIinvalidateBuffers, private)) {
if (DRI2CreateDrawable2(client, pDraw, drawId,
__glXDRIinvalidateBuffers, private,
&private->dri2_id)) {
free(private);
return NULL;
}