aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2017-12-05 22:39:34 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-07 07:20:55 +0100
commitaac4c5f590de3a6dacb01579848b25f6bdd3cc56 (patch)
tree2d30b58a9044c67c5f844fa9bc424ef7faa4052a
parente05b90814984e65bac2dc602bc368b2046a7b92e (diff)
downloadnx-libs-aac4c5f590de3a6dacb01579848b25f6bdd3cc56.tar.gz
nx-libs-aac4c5f590de3a6dacb01579848b25f6bdd3cc56.tar.bz2
nx-libs-aac4c5f590de3a6dacb01579848b25f6bdd3cc56.zip
DIX: XKB: Set xkbInfo to NULL as well as freeing it
Backported from X.org: commit 512bac25ec0e980968b93a2ebe88bd89bf99b697 Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Nov 6 14:52:03 2007 +0000 DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug # 10639) XkbRemoveResourceClient wants to access xkbInfo if it exists, so make sure we NULL it after freeing it. It doesn't make much sense to move the RemoveResourceClient call first, as there's not much point in notifying clients while we're shutting the server down anyway. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index d649a8657..427169222 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -210,6 +210,7 @@ CloseDevice(register DeviceIntPtr dev)
if (dev->key->xkbInfo)
XkbFreeInfo(dev->key->xkbInfo);
#endif
+ dev->key->xkbInfo = NULL;
free(dev->key->curKeySyms.map);
free(dev->key->modifierKeyMap);
free(dev->key);