From 9b62355847ce7df1ca144b4ebc9ff5c7286b573d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Jun 2008 11:10:11 +0930 Subject: [PATCH] xkb: reset xkb_cached_map on CloseDownDevices. Could lead to some invalid pointers in the second server generation. (cherry picked from commit ff3adf3e564d94fea18e48f966de40a7ded1279e) --- xkb/xkbInit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 87ee0720e..7723c749f 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -291,6 +291,9 @@ XkbDeleteRulesDflts() XkbVariantDflt = NULL; _XkbFree(XkbOptionsDflt); XkbOptionsDflt = NULL; + + XkbFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, True); + xkb_cached_map = NULL; } /***====================================================================***/