xserver: Branch 'mpx'

[Peter Hutterer]

 dix/events.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 14d0397cded699378fa3c19f4e61dbab7d3a9b2c (from f367285fd5825e0adc271982a529c9904ad65c89)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Aug 15 22:12:29 2007 +0930

    dix: ProcUngrabKeyboard: make sure grab is initialized.
    
    This should fix the random segfaults with ProcUngrabKeyboard.
    
    Thanks to David Nolden for spotting it.

diff --git a/dix/events.c b/dix/events.c
index 4cfdab7..76894ca 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5139,6 +5139,8 @@ ProcUngrabKeyboard(ClientPtr client)
     REQUEST_SIZE_MATCH(xResourceReq);
     UpdateCurrentTime();
 
+    grab = device->deviceGrab.grab;
+
     if (!grab || !grab->coreGrab || !SameClient(grab, client))
     {
 	for (grabbed = inputInfo.devices; grabbed; grabbed = grabbed->next)