dix: protect against floating slaves in DeviceFocusEvent.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-02 16:38:32 +10:00
parent b40289c876
commit ef9f851057

View File

@ -1231,7 +1231,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
DeviceIntPtr mouse;
int btlen, len, i;
mouse = (IsMaster(dev) || dev->u.master) ? GetPairedDevice(dev) : NULL;
mouse = (IsMaster(dev) || dev->u.master) ? GetMaster(dev, MASTER_POINTER) : dev;
/* XI 2 event */
btlen = (mouse->button) ? (mouse->button->numButtons + 7)/8 : 0;