X Strike Force X.Org X11 SVN commit: r3933 - in trunk/driver/xserver-xorg-input-evdev/debian: . patches
Author: dparsons
Date: 2006-11-01 06:00:05 -0500 (Wed, 01 Nov 2006)
New Revision: 3933
Added:
trunk/driver/xserver-xorg-input-evdev/debian/patches/30-absolute-axis.patch
Modified:
trunk/driver/xserver-xorg-input-evdev/debian/changelog
trunk/driver/xserver-xorg-input-evdev/debian/patches/series
Log:
* Apply upstream patch 30-absolute-axis.patch to avert potential
crashes in the absolute axis setup.
Modified: trunk/driver/xserver-xorg-input-evdev/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-11-01 10:46:46 UTC (rev 3932)
+++ trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-11-01 11:00:05 UTC (rev 3933)
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:1.1.2-6) UNRELEASED; urgency=low
+
+ * Apply upstream patch 30-absolute-axis.patch to avert potential
+ crashes in the absolute axis setup.
+
+ -- Drew Parsons <dparsons@debian.org> Wed, 1 Nov 2006 21:59:06 +1100
+
xserver-xorg-input-evdev (1:1.1.2-5) unstable; urgency=low
* Applied upstream patches 10-bitfield-fixes.patch and
Added: trunk/driver/xserver-xorg-input-evdev/debian/patches/30-absolute-axis.patch
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/30-absolute-axis.patch (rev 0)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/30-absolute-axis.patch 2006-11-01 11:00:05 UTC (rev 3933)
@@ -0,0 +1,31 @@
+From: Adam Jackson <ajax@nwnk.net>
+Date: Fri, 2 Jun 2006 19:39:52 +0000 (+0000)
+Subject: Fix an obvious bogon to avoid crashing on absolute axis setup.
+X-Git-Tag: xf86-video-impact-0_2_0
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=57a7f2844108072bf03c9f82baf92e3447d18fbe
+
+Fix an obvious bogon to avoid crashing on absolute axis setup.
+---
+
+--- 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:
+--- 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 {
Modified: trunk/driver/xserver-xorg-input-evdev/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/series 2006-11-01 10:46:46 UTC (rev 3932)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/series 2006-11-01 11:00:05 UTC (rev 3933)
@@ -1,3 +1,4 @@
10-bitfield-fixes.patch
11-bitops-fixes.patch
20-add-inotify-architectures.patch
+30-absolute-axis.patch
Reply to: