diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
| commit | 3d353f31ac1671d1b39c09b1f8d82c8811d3edd6 (patch) | |
| tree | ce19dbcec75ce7e87547f6f9b3495888aaea0966 /xorg-server/dix/touch.c | |
| parent | b2a0f04a2984b290c1224fc1b1883d08b01a6231 (diff) | |
| parent | e67b35e7a899da5805fcce3d390cb10ebcaffe91 (diff) | |
| download | vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.gz vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.bz2 vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/dix/touch.c')
| -rw-r--r-- | xorg-server/dix/touch.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c index dd16367d0..401cb981a 100644 --- a/xorg-server/dix/touch.c +++ b/xorg-server/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); |