From b3e65904dbb81181b207711dd7e40c5f85852cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 17 Nov 2021 07:57:28 +0100 Subject: Make XIPropertyValuePtr verification consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Expósito --- src/xf86libinput.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xf86libinput.c b/src/xf86libinput.c index 743a104..0d92b57 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c @@ -4435,7 +4435,7 @@ LibinputSetPropertyScrollButtonLock(DeviceIntPtr dev, struct xf86libinput *driver_data = pInfo->private; BOOL enabled; - if (val->format != 8 || val->type != XA_INTEGER || val->size != 1) + if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER) return BadMatch; enabled = *(BOOL*)val->data; @@ -4644,7 +4644,7 @@ LibinputSetPropertyHorizScroll(DeviceIntPtr dev, struct xf86libinput *driver_data = pInfo->private; BOOL enabled; - if (val->format != 8 || val->type != XA_INTEGER || val->size != 1) + if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER) return BadMatch; enabled = *(BOOL*)val->data; @@ -4671,7 +4671,7 @@ LibinputSetPropertyScrollPixelDistance(DeviceIntPtr dev, struct xf86libinput *driver_data = pInfo->private; uint32_t dist; - if (val->format != 32 || val->type != XA_CARDINAL || val->size != 1) + if (val->format != 32 || val->size != 1 || val->type != XA_CARDINAL) return BadMatch; dist = *(BOOL*)val->data; -- cgit v1.2.3