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

Xi: store mask_len before swapping in ProcXIGetSelectedEvents.

Browse Source 
Swapping the mask_len and then advancing the pointer by the swapped length
is just a bad idea.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-11 12:32:39 +10:00
parent 5043f42f36
commit a85d210b34
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Xi/xiselectev.c
View File

@ -224,10 +224,9 @@ ProcXIGetSelectedEvents(ClientPtr client)
{
if (devmask[j] != 0)
{
int mask_len = (j + 4)/4; /* j is an index, hence + 4, not + 3 */
evmask->deviceid = i;
evmask->mask_len = (j + 4)/4; /* j is an index, hence + 4,
not + 3 */
evmask->mask_len = mask_len;
reply.num_masks++;
reply.length += sizeof(xXIEventMask)/4 + evmask->mask_len;
@ -239,7 +238,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
memcpy(&evmask[1], devmask, j + 1);
evmask = (xXIEventMask*)((char*)evmask +
sizeof(xXIEventMask) + evmask->mask_len * 4);
sizeof(xXIEventMask) + mask_len * 4);
break;
}
}