xserver: Branch 'master'

[Peter Hutterer]

 dix/events.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64e595d12e05c4df56b0230cc57924b9beb274d3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Feb 19 09:18:53 2009 +1000

    dix: check if keybd->key is valid before getting the keyboard state.
    
    For floating SDs, GetPairedDevice() returns the SD itself, hence keybd->key
    may be NULL.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/events.c b/dix/events.c
index 10fa40d..928c2f0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3969,7 +3969,7 @@ DeviceEnterLeaveEvent(
     devEnterLeave->mode    |= (sameScreen ?  (ELFlagSameScreen << 4) : 0);
 
     devEnterLeave->state = mouse->button->state & 0x1f00;
-    if (keybd)
+    if (keybd && keybd->key)
         devEnterLeave->state |= XkbGrabStateFromRec(&keybd->key->xkbInfo->state);
 
     mskidx = mouse->id;