size += blah is technically correct but it implies that we're looping or otherwise incrementing the size. Which we don't, it's only ever set once.
Change this to avoid reviewer confusion. Reported-by: Dave "color-me-confused" Airlie <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> --- src/XGetDCtl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c index 51ed0ae..b576aa5 100644 --- a/src/XGetDCtl.c +++ b/src/XGetDCtl.c @@ -122,34 +122,34 @@ XGetDeviceControl( val_size = 3 * sizeof(int) * r->num_valuators; if ((sizeof(xDeviceResolutionState) + val_size) > nbytes) goto out; - size += sizeof(XDeviceResolutionState) + val_size; + size = sizeof(XDeviceResolutionState) + val_size; break; } case DEVICE_ABS_CALIB: { if (sizeof(xDeviceAbsCalibState) > nbytes) goto out; - size += sizeof(XDeviceAbsCalibState); + size = sizeof(XDeviceAbsCalibState); break; } case DEVICE_ABS_AREA: { if (sizeof(xDeviceAbsAreaState) > nbytes) goto out; - size += sizeof(XDeviceAbsAreaState); + size = sizeof(XDeviceAbsAreaState); break; } case DEVICE_CORE: { if (sizeof(xDeviceCoreState) > nbytes) goto out; - size += sizeof(XDeviceCoreState); + size = sizeof(XDeviceCoreState); break; } default: if (d->length > nbytes) goto out; - size += d->length; + size = d->length; break; } -- 1.8.1.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
