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>

DIX: XKB: Set xkbInfo to NULL as well as freeing it
aac4c5f5 · Daniel Stone · Mihai Moldovan · e05b9081 · aac4c5f5
Commit aac4c5f5 authored Dec 05, 2017 by Daniel Stone Committed by Mihai Moldovan Dec 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

devices.c nx-X11/programs/Xserver/dix/devices.c +1 -0

No files found.
--- 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);