hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-30 21:53:25 +00:00
Code Issues Projects Releases Wiki Activity

dix: remove caching of drawables and graphics contexts. The security checks

Browse source 
simply bypass the cached values so they are unused.
This commit is contained in:
Eamon Walsh 2007-08-14 11:39:26 -04:00 • committed by Eamon Walsh
commit 9a183d7ba5
9 changed files with 10 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dix/dixutils.c
View file

@ -208,7 +208,6 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
Mask type, Mask access)
{
DrawablePtr pTmp;
RESTYPE rtype;
int rc;
*pDraw = NULL;
@ -217,28 +216,15 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
if (id == INVALID)
return BadDrawable;
if (id == client->lastDrawableID) {
pTmp = client->lastDrawable;
rc = dixLookupResource((pointer *)&pTmp, id, RC_DRAWABLE, client, access);
/* an access check is required for cached drawables */
rtype = (type & M_WINDOW) ? RT_WINDOW : RT_PIXMAP;
rc = XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp);
if (rc != Success)
return rc;
} else
dixLookupResource((void **)&pTmp, id, RC_DRAWABLE, client, access);
if (!pTmp)
if (rc == BadValue)
return BadDrawable;
if (rc != Success)
return rc;
if (!((1 << pTmp->type) & (type ? type : M_DRAWABLE)))
return BadMatch;
if (type & M_DRAWABLE) {
client->lastDrawable = pTmp;
client->lastDrawableID = id;
client->lastGCID = INVALID;
client->lastGC = (GCPtr)NULL;
}
*pDraw = pTmp;
return Success;
}