aboutsummaryrefslogtreecommitdiff
path: root/src/draglock.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-02-02 11:00:30 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-02-02 11:12:28 +1000
commitb907c23d00feae0e361f02c80570ec490e44ad6f (patch)
treebfe8dfe3dede579e8db23f52b90840bdee427a87 /src/draglock.c
parentAdd README with pointers to mailing list, bugzilla & git repos (diff)
downloadxf86-input-evdev-b907c23d00feae0e361f02c80570ec490e44ad6f.tar.gz
xf86-input-evdev-b907c23d00feae0e361f02c80570ec490e44ad6f.tar.bz2
xf86-input-evdev-b907c23d00feae0e361f02c80570ec490e44ad6f.zip
Protect against zero-sized property values. #19882
X.Org Bug 19882 <http://bugs.freedesktop.org/show_bug.cgi?id=19882> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 07f40a04df28e9ee6318411beb71eedc7cd6e288)
Diffstat (limited to 'src/draglock.c')
-rw-r--r--src/draglock.c4
1 files changed, 3 insertions, 1 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)