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

glx: Fix potential crashes in glXWait{GL,X} 

glxc->drawPriv will be NULL if the context is direct, or if it is
current but without a bound drawable. Mesa's libGL won't normally emit
protocol for direct contexts for these calls, but a malign client could
still crash the server.
This commit is contained in:
Adam Jackson 2019-05-14 12:39:23 -04:00
parent a0f738a673
commit 2aec5c3c81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxcmds.c
View File

@ -765,7 +765,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc)
glFinish(); glFinish();
} }
if (glxc && glxc->drawPriv->waitGL) if (glxc && glxc->drawPriv && glxc->drawPriv->waitGL)
(*glxc->drawPriv->waitGL) (glxc->drawPriv); (*glxc->drawPriv->waitGL) (glxc->drawPriv);
return Success; return Success;
@ -789,7 +789,7 @@ __glXDisp_WaitX(__GLXclientState * cl, GLbyte * pc)
return error; return error;
} }
if (glxc && glxc->drawPriv->waitX) if (glxc && glxc->drawPriv && glxc->drawPriv->waitX)
(*glxc->drawPriv->waitX) (glxc->drawPriv); (*glxc->drawPriv->waitX) (glxc->drawPriv);
return Success; return Success;