svn merge ^/branches/released .

1 files changed, 4 insertions, 7 deletions

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 1232fe363..34dd80ff6 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -537,6 +537,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
     if (from->valuator)

     {

         ValuatorClassPtr v;

+

         if (!to->valuator)

         {

             classes = to->unused_classes;

@@ -545,18 +546,14 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
                 classes->valuator = NULL;

         }

 

-        to->valuator = realloc(to->valuator, sizeof(ValuatorClassRec) +

-                from->valuator->numAxes * sizeof(AxisInfo) +

-                from->valuator->numAxes * sizeof(double));

-        v = to->valuator;

+        v = AllocValuatorClass(to->valuator, from->valuator->numAxes);

+

         if (!v)

             FatalError("[Xi] no memory for class shift.\n");

 

-        v->numAxes = from->valuator->numAxes;

-        v->axes = (AxisInfoPtr)&v[1];

+        to->valuator = v;

         memcpy(v->axes, from->valuator->axes, v->numAxes * sizeof(AxisInfo));

 

-        v->axisVal = (double*)(v->axes + from->valuator->numAxes);

         v->sourceid = from->id;

     } else if (to->valuator && !from->valuator)

     {