xserver: Branch 'master'

[Peter Hutterer]

 dix/devices.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2257e20900460d85254734b595238e7ad5ee55c8
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Feb 27 17:15:28 2008 +1030

    dix: set dev->key to NULL after freeing it in CloseDevice. (Bug #12830)
    
    Otherwise XkbRemoveResourceClient may try to dereference it lateron.
    
    X.Org Bug 12830 <http://bugs.freedesktop.org/show_bug.cgi?id=12830>

diff --git a/dix/devices.c b/dix/devices.c
index bdcca5a..4b20655 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -529,6 +529,7 @@ CloseDevice(DeviceIntPtr dev)
 	xfree(dev->key->curKeySyms.map);
 	xfree(dev->key->modifierKeyMap);
 	xfree(dev->key);
+        dev->key = NULL;
     }
 
     if (dev->valuator) {