andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to fix drawable type checks in dixLookupDrawable().

Browse Source 
Not sure this is 100% correct either, but it fixes at least one reproducible
crasher where it returned a pixmap to dixLookupWindow().
This commit is contained in:
Michel Dänzer 2007-01-08 19:22:41 +01:00
parent 0b73a7eb17
commit 282a4dcaab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/dixutils.c
View File

@ -219,7 +219,7 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
pTmp = client->lastDrawable;
/* an access check is required for cached drawables */
rtype = (pTmp->type | M_WINDOW) ? RT_WINDOW : RT_PIXMAP;
rtype = (type & M_WINDOW) ? RT_WINDOW : RT_PIXMAP;
if (!XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp))
return BadDrawable;
} else
@ -227,10 +227,10 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
access);
if (!pTmp)
return BadDrawable;
if (!((1 << pTmp->type) | (type ? type : M_DRAWABLE)))
if (!((1 << pTmp->type) & (type ? type : M_DRAWABLE)))
return BadMatch;
if (pTmp->type | M_DRAWABLE) {
if (type & M_DRAWABLE) {
client->lastDrawable = pTmp;
client->lastDrawableID = id;
client->lastGCID = INVALID;