Fix an obvious bogon to avoid crashing on absolute axis setup.

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e47942..4a6af91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* src/evdev_axes.c:
+	Fix an obvious bogon to avoid crashing on absolute axis setup.
+
 2006-05-15  Zephaniah E. Hull,,,  <warp@aehallh.com>
 
 	* src/evdev.h:
diff --git a/src/evdev_axes.c b/src/evdev_axes.c
index d1bafd9..0d9b5a7 100644
--- a/src/evdev_axes.c
+++ b/src/evdev_axes.c
@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo)
 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
     else
 	k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
-    if (k < screenInfo.numScreens) {
+    if (k < screenInfo.numScreens && k >= 0) {
 	state->abs->screen = k;
 	xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
     } else {