mirror of
https://github.com/X11Libre/xf86-input-libinput.git
synced 2026-03-24 01:24:04 +00:00
Make XIPropertyValuePtr verification consistent
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user