summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-09 16:23:24 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-10 16:58:08 +1030
commit4808bdec45775342eb9a6352b41e4919e1a69279 (patch)
tree5330fc9248dad51eec5e31297d6ef1a83a60f01f /Xi
parent18cdd733ad3dd36fa0a23dfbf18c7d99b86c0276 (diff)
Xi: don't memcpy the KeyClassRec from SD to MD. #16167
Most of its component get copied during CopyKeyClass anyway. The ones that aren't: postdown - never changed for virtual devices anyway. down - shouldn't change that without sending events. memcpy'ing the struct also copied mapWidth, which means we didn't realloc during SetKeySymsMap lateron, overwriting the memory assigned to us. X.Org Bug 16167 <http://bugs.freedesktop.org/show_bug.cgi?id=16167>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/exevents.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 6f652794f..155cb9b52 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -527,8 +527,6 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
oldXkbInfo = to->key->xkbInfo;
#endif
- memcpy(to->key, from->key, sizeof(KeyClassRec));
-
if (!oldMap) /* newly created key struct */
{
int bytes = (to->key->curKeySyms.maxKeyCode -