From aac4c5f590de3a6dacb01579848b25f6bdd3cc56 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 5 Dec 2017 22:39:34 +0100 Subject: DIX: XKB: Set xkbInfo to NULL as well as freeing it Backported from X.org: commit 512bac25ec0e980968b93a2ebe88bd89bf99b697 Author: Daniel Stone 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 --- nx-X11/programs/Xserver/dix/devices.c | 1 + 1 file changed, 1 insertion(+) (limited to 'nx-X11/programs/Xserver/dix/devices.c') 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); -- cgit v1.2.3