frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent double unref of glxdrawables 

Found by valgrind. Bug #18917.
This commit is contained in:
Pierre Willenbrock 2009-01-30 21:16:48 -08:00 committed by Eric Anholt
parent 60bcdd6870
commit 29b3b88dc7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxcmds.c
View File

@ -146,6 +146,8 @@ __glXContextDestroy(__GLXcontext *context)
__glXUnrefDrawable(context->drawPriv); __glXUnrefDrawable(context->drawPriv);
if (context->readPriv) if (context->readPriv)
__glXUnrefDrawable(context->readPriv); __glXUnrefDrawable(context->readPriv);
context->drawPriv = NULL;
context->readPriv = NULL;
} }
__glXFlushContextCache(); __glXFlushContextCache();
} }
@ -621,6 +623,8 @@ DoMakeCurrent(__GLXclientState *cl,
__glXUnrefDrawable(prevglxc->drawPriv); __glXUnrefDrawable(prevglxc->drawPriv);
if (prevglxc->readPriv) if (prevglxc->readPriv)
__glXUnrefDrawable(prevglxc->readPriv); __glXUnrefDrawable(prevglxc->readPriv);
prevglxc->drawPriv = NULL;
prevglxc->readPriv = NULL;
} }
} }

3
hw/xfree86/modes/xf86Crtc.c
View File

@ -3159,9 +3159,6 @@ xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr crtc; xf86CrtcPtr crtc;
if (!xf86_config)
return FALSE;
if (xf86_config->num_crtc == 0) if (xf86_config->num_crtc == 0)
return FALSE; return FALSE;
crtc = xf86_config->crtc[0]; crtc = xf86_config->crtc[0];