diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-04-20 11:08:15 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-03 11:23:47 +1000 |
| commit | 345761be71b86b687f407eb8de746a33bab7ad2e (patch) | |
| tree | 79ddd8b88f7b3d7373956c3afeb069044dfd0f1e | |
| parent | ed33772a0d3ace5844e157ae78885ded000819ea (diff) | |
TouchListenerAcceptReject: Warn and return early on bad listener index
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 5c361d59c5031d9b3f7f9093a52d2b1ff4d9ae5f)
| -rw-r--r-- | dix/touch.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dix/touch.c b/dix/touch.c index dd16367d0..401cb981a 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -966,6 +966,11 @@ TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, int listener, int nev; int i; + BUG_WARN(listener < 0); + BUG_WARN(listener >= ti->num_listeners); + if (listener < 0 || listener >= ti->num_listeners) + return BadMatch; + if (listener > 0) { if (mode == XIRejectTouch) TouchRejected(dev, ti, ti->listeners[listener].listener, NULL); |