diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-21 16:49:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-22 08:19:26 +1000 |
| commit | c04fb18412be3908678cf3fc68a899272e6835bb (patch) | |
| tree | 3d75d0ba6414cea84b5e86b7e988d06cfbee2aa5 | |
| parent | a6ac60245f3c121979c18e70b40045aa751d6c54 (diff) | |
| download | xf86-input-wacom-c04fb18412be3908678cf3fc68a899272e6835bb.tar.gz | |
Fix touch property out-of-bounds memory access.
4fd2af39a5432eaad03af6a48cd16988a165fbbb split out the touch setting from a
combined property into its own separate one. The index didn't get updated
though, which means wcmTouch was assigned random garbage.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Ping Cheng <pinglinux@gmail.com>
| -rw-r--r-- | src/wcmXCommand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c index 698c280..31b9945 100644 --- a/src/wcmXCommand.c +++ b/src/wcmXCommand.c @@ -552,8 +552,8 @@ int xf86WcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, if ((values[0] != 0) && (values[0] != 1)) return BadValue; - if (!checkonly && common->wcmTouch != values[1]) - common->wcmTouch = values[1]; + if (!checkonly && common->wcmTouch != values[0]) + common->wcmTouch = values[0]; } else if (property == prop_hover) { CARD8 *values = (CARD8*)prop->data; |