summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/draglock.c4
-rw-r--r--src/emuWheel.c12
2 files changed, 12 insertions, 4 deletions
diff --git a/src/draglock.c b/src/draglock.c
index 631da17..8e97b0d 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -243,7 +243,9 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
return BadValue;
}
- if (val->size == 1)
+ if (val->size == 0)
+ return BadMatch;
+ else if (val->size == 1)
{
int meta = *((CARD8*)val->data);
if (meta > EVDEV_MAXBUTTONS)
diff --git a/src/emuWheel.c b/src/emuWheel.c
index b007de0..488a6a2 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -350,11 +350,13 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
}
else if (atom == prop_wheel_button)
{
- int bt = *((CARD8*)val->data);
+ int bt;
if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
return BadMatch;
+ bt = *((CARD8*)val->data);
+
if (bt < 0 || bt >= EVDEV_MAXBUTTONS)
return BadValue;
@@ -374,11 +376,13 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
}
} else if (atom == prop_wheel_inertia)
{
- int inertia = *((CARD16*)val->data);
+ int inertia;
if (val->format != 16 || val->size != 1 || val->type != XA_INTEGER)
return BadMatch;
+ inertia = *((CARD16*)val->data);
+
if (inertia < 0)
return BadValue;
@@ -386,11 +390,13 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
pEvdev->emulateWheel.inertia = inertia;
} else if (atom == prop_wheel_timeout)
{
- int timeout = *((CARD16*)val->data);
+ int timeout;
if (val->format != 16 || val->size != 1 || val->type != XA_INTEGER)
return BadMatch;
+ timeout = *((CARD16*)val->data);
+
if (timeout < 0)
return BadValue;