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.
This commit is contained in:
parent
d7c5e8bfc1
commit
512bac25ec
|
@ -528,6 +528,7 @@ CloseDevice(DeviceIntPtr dev)
|
||||||
if (dev->key->xkbInfo)
|
if (dev->key->xkbInfo)
|
||||||
XkbFreeInfo(dev->key->xkbInfo);
|
XkbFreeInfo(dev->key->xkbInfo);
|
||||||
#endif
|
#endif
|
||||||
|
dev->key->xkbInfo = NULL;
|
||||||
xfree(dev->key->curKeySyms.map);
|
xfree(dev->key->curKeySyms.map);
|
||||||
xfree(dev->key->modifierKeyMap);
|
xfree(dev->key->modifierKeyMap);
|
||||||
xfree(dev->key);
|
xfree(dev->key);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user