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

glx: test for valid read and draw privates before using them 

this should fix a bug where f-spot exiting blows up the X server
This commit is contained in:
Dave Airlie 2008-04-24 16:37:29 +10:00
parent f377141912
commit ae982a27e4
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GL/glx/glxutil.c
View File

@ -81,8 +81,8 @@ __glXDeassociateContext(__GLXcontext *glxc)
__GLXcontext *curr, *prev; __GLXcontext *curr, *prev;
prev = NULL; prev = NULL;
for ( curr = glxc->drawPriv->drawGlxc if (glxc->drawPriv) {
; curr != NULL for ( curr = glxc->drawPriv->drawGlxc; curr != NULL
; prev = curr, curr = curr->nextDrawPriv ) { ; prev = curr, curr = curr->nextDrawPriv ) {
if (curr == glxc) { if (curr == glxc) {
/* found context. Deassociate. */ /* found context. Deassociate. */
@ -96,9 +96,10 @@ __glXDeassociateContext(__GLXcontext *glxc)
break; break;
} }
} }
}
prev = NULL; prev = NULL;
if (glxc->readPriv) {
for ( curr = glxc->readPriv->readGlxc for ( curr = glxc->readPriv->readGlxc
; curr != NULL ; curr != NULL
; prev = curr, curr = curr->nextReadPriv ) { ; prev = curr, curr = curr->nextReadPriv ) {
@ -115,6 +116,7 @@ __glXDeassociateContext(__GLXcontext *glxc)
} }
} }
} }
}
/*****************************************************************************/ /*****************************************************************************/
/* Drawable private stuff */ /* Drawable private stuff */