diff options
| author | Joe Shaw <joeshaw@litl.com> | 2010-10-14 15:09:20 -0400 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-11-11 12:38:06 +0100 |
| commit | 2fce4783f41b7fb1106b2945cc98bfc8da39501d (patch) | |
| tree | 13e211614cd0470c1c2ea4866fa5b90609a7c8f9 | |
| parent | 9d939ea0f42954f40bbc8388b7c7f62470cdf338 (diff) | |
fix a sign problem with valuator data.
Without this patch, any negative valuator value is wrong when returned
from XQueryDeviceState(). This is a regression from at least xserver
1.4.
Valuator data is set in dix/getevents.c:set_valuators() by copying
signed int values into an unsigned int field
DeviceEvent.valuators.data.
That data is converted into a double with an implicit cast by
assignment to axisVal[i] in Xi/exevents.c:UpdateDeviceState().
That double is converted back to a signed int in
queryst.c:ProcXQueryDeviceState(). If the original value in
set_valuators() is negative, the double value will be > 2^31 and the
conversion back to a signed int is undefined. (Although I
consistently see the value -2^31.)
Fix this by changing the definition of DeviceEvent.valuators.data from
uint32_t to int32_t.
Signed-off-by: Joe Shaw <joeshaw@litl.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit e354ccac36a8ee3a23bdc845833c16a5646cc200)
| -rw-r--r-- | dix/getevents.c | 2 | ||||
| -rw-r--r-- | include/eventstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 82bb77b4b..531595ede 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -177,7 +177,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, int first_valuator, } memcpy(&event->valuators.data[first_valuator], - valuators, num_valuators * sizeof(uint32_t)); + valuators, num_valuators * sizeof(int32_t)); } diff --git a/include/eventstr.h b/include/eventstr.h index 433227e6e..377cceba2 100644 --- a/include/eventstr.h +++ b/include/eventstr.h @@ -99,7 +99,7 @@ struct _DeviceEvent struct { uint8_t mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */ uint8_t mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/ - uint32_t data[MAX_VALUATORS]; /**< Valuator data */ + int32_t data[MAX_VALUATORS]; /**< Valuator data */ int32_t data_frac[MAX_VALUATORS]; /**< Fractional part for data */ } valuators; struct { |