frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: set DeviceXXXState's length fields to the correct size of the struct. 

Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.

Spotted by Simon Thum.
This commit is contained in:
Peter Hutterer 2007-11-27 10:22:44 +10:30
parent a4edfbef02
commit 0f2398d06c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xi/getdctl.c
View File

@ -128,7 +128,7 @@ static void CopySwapDeviceAbsCalib (ClientPtr client, AbsoluteClassPtr dts,
xDeviceAbsCalibState *calib = (xDeviceAbsCalibState *) buf; xDeviceAbsCalibState *calib = (xDeviceAbsCalibState *) buf;
calib->control = DEVICE_ABS_CALIB; calib->control = DEVICE_ABS_CALIB;
calib->length = sizeof(calib); calib->length = sizeof(xDeviceAbsCalibState);
calib->min_x = dts->min_x; calib->min_x = dts->min_x;
calib->max_x = dts->max_x; calib->max_x = dts->max_x;
calib->min_y = dts->min_y; calib->min_y = dts->min_y;
@ -159,7 +159,7 @@ static void CopySwapDeviceAbsArea (ClientPtr client, AbsoluteClassPtr dts,
xDeviceAbsAreaState *area = (xDeviceAbsAreaState *) buf; xDeviceAbsAreaState *area = (xDeviceAbsAreaState *) buf;
area->control = DEVICE_ABS_AREA; area->control = DEVICE_ABS_AREA;
area->length = sizeof(area); area->length = sizeof(xDeviceAbsAreaState);
area->offset_x = dts->offset_x; area->offset_x = dts->offset_x;
area->offset_y = dts->offset_y; area->offset_y = dts->offset_y;
area->width = dts->width; area->width = dts->width;
@ -185,7 +185,7 @@ static void CopySwapDeviceCore (ClientPtr client, DeviceIntPtr dev, char *buf)
xDeviceCoreState *c = (xDeviceCoreState *) buf; xDeviceCoreState *c = (xDeviceCoreState *) buf;
c->control = DEVICE_CORE; c->control = DEVICE_CORE;
c->length = sizeof(c); c->length = sizeof(xDeviceCoreState);
c->status = dev->coreEvents; c->status = dev->coreEvents;
c->iscore = (dev == inputInfo.keyboard || dev == inputInfo.pointer); c->iscore = (dev == inputInfo.keyboard || dev == inputInfo.pointer);
@ -202,7 +202,7 @@ static void CopySwapDeviceEnable (ClientPtr client, DeviceIntPtr dev, char *buf)
xDeviceEnableState *e = (xDeviceEnableState *) buf; xDeviceEnableState *e = (xDeviceEnableState *) buf;
e->control = DEVICE_ENABLE; e->control = DEVICE_ENABLE;
e->length = sizeof(e); e->length = sizeof(xDeviceEnableState);
e->enable = dev->enabled; e->enable = dev->enabled;
if (client->swapped) { if (client->swapped) {