diff options
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/geext.c | 2 | ||||
| -rw-r--r-- | xorg-server/Xext/xtest.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/Xext/geext.c b/xorg-server/Xext/geext.c index 951daf682..93e5277cc 100644 --- a/xorg-server/Xext/geext.c +++ b/xorg-server/Xext/geext.c @@ -185,7 +185,7 @@ SGEGenericEvent(xEvent* from, xEvent* to) xGenericEvent* gefrom = (xGenericEvent*)from;
xGenericEvent* geto = (xGenericEvent*)to;
- if (gefrom->extension > MAXEXTENSIONS)
+ if ((gefrom->extension & 0x7f) > MAXEXTENSIONS)
{
ErrorF("GE: Invalid extension offset for event.\n");
return;
diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c index 859057e2b..0548a8e74 100644 --- a/xorg-server/Xext/xtest.c +++ b/xorg-server/Xext/xtest.c @@ -374,10 +374,7 @@ ProcXTestFakeInput(ClientPtr client) if (!dev->valuator)
return BadDevice;
- /* broken lib, XI events have root uninitialized */
- if (extension || ev->u.keyButtonPointer.root == None)
- root = GetCurrentRootWindow(dev);
- else
+ if (!(extension || ev->u.keyButtonPointer.root == None))
{
rc = dixLookupWindow(&root, ev->u.keyButtonPointer.root,
client, DixGetAttrAccess);
|