summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-02-27 17:15:28 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-02-27 17:32:29 +1030
commit2257e20900460d85254734b595238e7ad5ee55c8 (patch)
treec2bb038a5fd5548f3bf8f5f3f0e080636990fb37 /dix
parent3f0681fb0b2d0744c2ef892883ae5359b43a4a9a (diff)
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>
Diffstat (limited to 'dix')
-rw-r--r--dix/devices.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c
index bdcca5aba..4b20655c6 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) {