Author: daniel
Date: 2003-09-02 17:51:58 -0500 (Tue, 02 Sep 2003)
New Revision: 470
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
* Fix libxaa bug that could result in NULL pointers being passed to drivers,
and thus complete machine death (thanks, Thomas Winischhofer).
+ debian/patches/000_stolen_from_HEAD.diff: new stanza, per Thomas
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-02 22:49:30 UTC (rev 469)
+++ branches/4.3.0/sid/debian/changelog 2003-09-02 22:51:58 UTC (rev 470)
@@ -12,6 +12,10 @@
+ debian/MANIFEST.*: updated for synaptics_drv.o
+ debian/xserver-xfree86.install.*: install synaptics_drv.o
+ * Fix libxaa bug that could result in NULL pointers being passed to drivers,
+ and thus complete machine death (thanks, Thomas Winischhofer).
+ + debian/patches/000_stolen_from_HEAD.diff: new stanza, per Thomas
+
* Address xlibmesa* package upgrade issues from woody and 4.2.1 packages in
sarge/sid.
+ debian/scripts/vars.{alpha,i386,ia64,powerpc,sparc}:
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-09-02
22:49:30 UTC (rev 469)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-09-02
22:51:58 UTC (rev 470)
@@ -5,6 +5,8 @@
* Drivers shouldn't have to care about recolouring ARGB cursors.
* Fix Xv regression in trident driver.
* Implement two missing relocations in the ia64 module loader.
+ * Fix a libxaa bug that could cause NULL pointers to be passed to drivers,
and
+ a complete deadlock.
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
@@ -560,3 +562,19 @@
}
}
return lookup;
+--- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 25 Sep 2000 23:56:14
-0000 1.30
++++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 16 Aug 2003 01:11:40
-0000 1.31
+@@ -765,2 +765,3 @@
+ 3) Don't make more than MAX_512.
++ 4) Don't have any of there are no 256x256s.
+
+@@ -787,2 +788,9 @@
+ if(Target256 < 4) Target256 = 0;
++
++ if(Num512 && Num256 < 4) {
++ while(Num512 && Num256 < Target256) {
++ SubdivideList(&List512, &List256);
++ Num256 += 4; Num512--;
++ }
++ }
+
