diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-19 09:18:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-19 09:51:51 +1000 |
| commit | 64e595d12e05c4df56b0230cc57924b9beb274d3 (patch) | |
| tree | 51e1a8c8cde7dace495e6636d67d8e7ed046b46f | |
| parent | e0a451eb7cc812f11db3614b730ba0f07d6ae18c (diff) | |
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@who-t.net>
| -rw-r--r-- | dix/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |