glx: avoid possible NULLptr deref, fix #16884
This commit is contained in:
committed by
Maarten Maathuis
parent
421b7e8f12
commit
99583b43a9
@@ -148,8 +148,10 @@ void
|
|||||||
__glXContextDestroy(__GLXcontext *context)
|
__glXContextDestroy(__GLXcontext *context)
|
||||||
{
|
{
|
||||||
if (!context->isDirect) {
|
if (!context->isDirect) {
|
||||||
__glXUnrefDrawable(context->drawPriv);
|
if (context->drawPriv)
|
||||||
__glXUnrefDrawable(context->readPriv);
|
__glXUnrefDrawable(context->drawPriv);
|
||||||
|
if (context->readPriv)
|
||||||
|
__glXUnrefDrawable(context->readPriv);
|
||||||
}
|
}
|
||||||
__glXFlushContextCache();
|
__glXFlushContextCache();
|
||||||
}
|
}
|
||||||
@@ -621,8 +623,10 @@ DoMakeCurrent(__GLXclientState *cl,
|
|||||||
}
|
}
|
||||||
__glXFlushContextCache();
|
__glXFlushContextCache();
|
||||||
if (!prevglxc->isDirect) {
|
if (!prevglxc->isDirect) {
|
||||||
__glXUnrefDrawable(prevglxc->drawPriv);
|
if (prevglxc->drawPriv)
|
||||||
__glXUnrefDrawable(prevglxc->readPriv);
|
__glXUnrefDrawable(prevglxc->drawPriv);
|
||||||
|
if (prevglxc->readPriv)
|
||||||
|
__glXUnrefDrawable(prevglxc->readPriv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user