summaryrefslogtreecommitdiff
path: root/Xi/xiallowev.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-05 10:15:04 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-05 16:09:09 +1000
commit2b459f44f3edaea137df9a28bc7adfeb1b9f1df7 (patch)
tree5ff76082d0d87205df3e553bccf0841c3996923e /Xi/xiallowev.c
parentc77f42049f77417c68bbce3dd2e995d916fc5af5 (diff)
Xi: return BadImplementation for deviceids 256 and above
The protocol allows for 16 bit device ids, but the implementation doesn't yet. We need to break the input ABI once more to shift the DeviceIntRec's CARD8 to a CARD16, along with some changes in the privates. Once that is done, revert this patch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/xiallowev.c')
-rw-r--r--Xi/xiallowev.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 3077e1a44..dd52c53c6 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -65,6 +65,12 @@ ProcXIAllowEvents(ClientPtr client)
REQUEST(xXIAllowEventsReq);
REQUEST_SIZE_MATCH(xXIAllowEventsReq);
+ if (stuff->deviceid > 0xFF) /* FIXME */
+ {
+ client->errorValue = stuff->deviceid;
+ return BadImplementation;
+ }
+
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
if (ret != Success)
return ret;