From 81257377a2d011ce47fba5822df0f7918dea1d72 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Fri, 1 Apr 2011 22:51:48 +0200 Subject: [PATCH] Xi: take XI2 requests into account also for the swapping case. Signed-off-by: Matthieu Herrb Reviewed-by: Julien Cristau --- Xi/extinit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Xi/extinit.c b/Xi/extinit.c index 46d34599c..289558fae 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -49,6 +49,7 @@ SOFTWARE. * Dispatch routines and initialization routines for the X input extension. * */ +#define ARRAY_SIZE(_a) (sizeof((_a)) / sizeof((_a)[0])) #define NUMTYPES 15 @@ -410,7 +411,7 @@ static int ProcIDispatch(ClientPtr client) { REQUEST(xReq); - if (stuff->data > (IREQUESTS + XI2REQUESTS) || !ProcIVector[stuff->data]) + if (stuff->data > ARRAY_SIZE(ProcIVector) || !ProcIVector[stuff->data]) return BadRequest; return (*ProcIVector[stuff->data])(client); @@ -429,7 +430,7 @@ static int SProcIDispatch(ClientPtr client) { REQUEST(xReq); - if (stuff->data > IREQUESTS || !SProcIVector[stuff->data]) + if (stuff->data > ARRAY_SIZE(SProcIVector) || !SProcIVector[stuff->data]) return BadRequest; return (*SProcIVector[stuff->data])(client);