From 64e595d12e05c4df56b0230cc57924b9beb274d3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Feb 2009 09:18:53 +1000 Subject: [PATCH] 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 --- dix/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index 10fa40d19..928c2f01a 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;