andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xi: fix up sloppy class copying causing segfaults.

Browse Source
This commit is contained in:
Peter Hutterer 2007-11-15 16:27:18 +10:30
parent 53539688ca
commit 070195dbf8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Xi/exevents.c
View File

@ -220,6 +220,7 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
#ifdef XKB
to->key->xkbInfo = NULL;
#endif
to->key->curKeySyms.map = NULL;
CopyKeyClass(from, to);
}
@ -233,8 +234,12 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
if (!v)
FatalError("[Xi] no memory for class shift.\n");
memcpy(v, from->valuator, sizeof(ValuatorClassRec));
v->motion = NULL;
v->axes = (AxisInfoPtr)&v[1];
memcpy(v->axes, from->valuator->axes, v->numAxes * sizeof(AxisInfo));
v->axisVal = (int*)(v->axes + from->valuator->numAxes);
}
ALLOC_COPY_CLASS_IF(button, ButtonClassRec);