X Strike Force X.Org X11 SVN commit: r3981 - in trunk/xserver/xorg-server/debian: . patches
Author: julien
Date: 2006-11-10 16:04:32 -0500 (Fri, 10 Nov 2006)
New Revision: 3981
Added:
trunk/xserver/xorg-server/debian/patches/36_fix_ffs.patch
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/series
Log:
* Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs()
if called with a null argument (closes: #395564).
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-11-10 09:00:00 UTC (rev 3980)
+++ trunk/xserver/xorg-server/debian/changelog 2006-11-10 21:04:32 UTC (rev 3981)
@@ -10,14 +10,16 @@
[ Julien Cristau ]
* Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks,
Samuel Thibault.
- * Update hurd support patch (Closes: #356300). Thanks, Samuel Thibault.
+ * Update hurd support patch (closes: #356300). Thanks, Samuel Thibault.
* Add reportbug script stolen from the monolith, to add the user's config
and log file in every bug report.
* Delete hw/xfree86/common/xf86Build.h from our source tree, so that the
build date is correctly calculated at build time, and not hardcoded to
07 July 2006. Thanks to Jurij Smakov for noticing.
+ * Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs()
+ if called with a null argument (closes: #395564).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 8 Nov 2006 07:59:33 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Fri, 10 Nov 2006 22:00:28 +0100
xorg-server (2:1.1.1-10) unstable; urgency=low
Added: trunk/xserver/xorg-server/debian/patches/36_fix_ffs.patch
===================================================================
--- trunk/xserver/xorg-server/debian/patches/36_fix_ffs.patch (rev 0)
+++ trunk/xserver/xorg-server/debian/patches/36_fix_ffs.patch 2006-11-10 21:04:32 UTC (rev 3981)
@@ -0,0 +1,18 @@
+Fix for ffs() to correctly handle the case when it is called with argument of
+zero.
+This patch by Jurij Smakov <jurij@wooyd.org>
+Submitted upstream to X.Org:
+https://bugs.freedesktop.org/show_bug.cgi?id=8968
+
+Index: xorg-server/dix/ffs.c
+===================================================================
+--- xorg-server.orig/dix/ffs.c 2006-10-21 21:44:19.000000000 +0200
++++ xorg-server/dix/ffs.c 2006-11-10 21:55:33.000000000 +0100
+@@ -31,6 +31,7 @@
+ ffs(int i)
+ {
+ int j;
++ if (i == 0) return 0;
+ for (j = 1; (i & 1) == 0; j++)
+ i >>= 1;
+ return j;
Modified: trunk/xserver/xorg-server/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2006-11-10 09:00:00 UTC (rev 3980)
+++ trunk/xserver/xorg-server/debian/patches/series 2006-11-10 21:04:32 UTC (rev 3981)
@@ -31,3 +31,4 @@
33_Xserver_man_typos.patch
34_xorg.conf_man_typos.patch
35_randr_byteswap.patch
+36_fix_ffs.patch
Reply to: