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

dix: Fix undefined shift in HashResourceID 

Again, we need all of the bits of an unsigned int to make this work.
This commit is contained in:
Adam Jackson 2019-10-15 13:08:57 -04:00
parent 3671a3ee88
commit 1e5f478b7e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/resource.c
View File

@ -671,7 +671,7 @@ InitClientResources(ClientPtr client)
} }
int int
HashResourceID(XID id, int numBits) HashResourceID(XID id, unsigned int numBits)
{ {
static XID mask; static XID mask;
@ -679,7 +679,7 @@ HashResourceID(XID id, int numBits)
mask = RESOURCE_ID_MASK; mask = RESOURCE_ID_MASK;
id &= mask; id &= mask;
if (numBits < 9) if (numBits < 9)
return (id ^ (id >> numBits) ^ (id >> (numBits<<1))) & ~((~0) << numBits); return (id ^ (id >> numBits) ^ (id >> (numBits<<1))) & ~((~0U) << numBits);
return (id ^ (id >> numBits)) & ~((~0) << numBits); return (id ^ (id >> numBits)) & ~((~0) << numBits);
} }

3
include/resource.h
View File

@ -270,7 +270,6 @@ extern _X_EXPORT RESTYPE TypeMask;
of bits by either masking numBits lower bits of the ID or by of bits by either masking numBits lower bits of the ID or by
providing at most MAXHASHSIZE hashes. providing at most MAXHASHSIZE hashes.
*/ */
extern _X_EXPORT int HashResourceID(XID id, extern _X_EXPORT int HashResourceID(XID id, unsigned int numBits);
int numBits);
#endif /* RESOURCE_H */ #endif /* RESOURCE_H */