From ef9f851057a0ae214be02cb919f1e6634cead20b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 2 Jun 2009 16:38:32 +1000
Subject: [PATCH] dix: protect against floating slaves in DeviceFocusEvent.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Xi/exevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index b19c8e214..fbcf6e3a9 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -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;