summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-04-09 10:33:15 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-04-09 10:33:15 +1000
commit6c1c53d296f42b4bdadadf1d85750c4610fc4096 (patch)
treea28b4c2b7ea4fddfaf91975c04b5dd9a248fcd3c
parent34f14fdf1222d0b4e75a022fd10a04d57800ea93 (diff)
downloadxorg-driver-xf86-input-libinput-6c1c53d296f42b4bdadadf1d85750c4610fc4096.tar.gz
Make sure the device is valid when setting the tap button map
Fixes #34 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86libinput.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 92817a5..7aebacf 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -3812,10 +3812,14 @@ LibinputSetPropertyTapButtonmap(DeviceIntPtr dev,
data = (BOOL*)val->data;
- if (checkonly &&
- ((data[0] && data[1]) || (!data[0] && !data[1])))
+ if (checkonly) {
+ if ((data[0] && data[1]) || (!data[0] && !data[1]))
return BadValue;
+ if (!xf86libinput_check_device (dev, atom))
+ return BadMatch;
+ }
+
if (data[0])
map = LIBINPUT_CONFIG_TAP_MAP_LRM;
else if (data[1])