rpms/xorg-x11/FC-4 xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch, NONE, 1.1 xorg-x11.spec, 1.223, 1.224

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12583

Modified Files:
	xorg-x11.spec 
Added Files:
	xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch 
Log Message:
* Fri May 5 2006 Mike A. Harris <mharris at redhat.com> 6.8.2-37.FC4.49.4
- Merge the xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch patch into the FC-4
  branch from the FC-4-embargoed branch, previously released as a security
  update 6.8.2-37.FC4.49.2.1 based on the 6.8.2-37.FC4.49.2 build. (#190420)
- Re-enable the xorg-x11-6.8.2-add-i945-support.patch disabled in previous
  test build.


xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch:
 render/mitri.c                     |    0 
 xc/programs/Xserver/render/mitri.c |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch ---
Index: render/mitri.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
retrieving revision 1.5
diff -u -r1.5 mitri.c
--- xc/programs/Xserver/render/mitri.c	3 Jul 2005 07:02:08 -0000	1.5
+++ xc/programs/Xserver/render/mitri.c	18 Apr 2006 22:34:08 -0000
@@ -145,7 +145,7 @@
     if (npoint < 3)
 	return;
     ntri = npoint - 2;
-    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
     if (!tris)
 	return;
     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
@@ -177,7 +177,7 @@
     if (npoint < 3)
 	return;
     ntri = npoint - 2;
-    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
     if (!tris)
 	return;
     first = points++;


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- xorg-x11.spec	2 May 2006 07:57:33 -0000	1.223
+++ xorg-x11.spec	5 May 2006 05:21:27 -0000	1.224
@@ -30,7 +30,7 @@
 # future updates or respins, etc.  In short, 'n' gets bumped only when
 # doing devel->FC-4 branch merges (and reset r to 0), and 'r' gets
 # incremented for all other updates.
-Release: 37.FC4.49.3.test_no_i945.0
+Release: 37.FC4.49.4
 
 %define build_mharris_mode	0
 
@@ -494,6 +494,8 @@
 Patch9338: xorg-x11-6.8.2-ia64-elfloader-cache-flush.patch
 Patch9339: xorg-x11-6.8.2-xkb-dutch-keyboard-layout-fixes.patch
 
+Patch9350: xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch
+
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently).
 # Once a patch is determined to be safe to apply to other releases, it can
 # be moved to the normal section above in sequence.
@@ -1169,6 +1171,8 @@
 %patch9338 -p0 -b .ia64-elfloader-cache-flush
 %patch9339 -p0 -b .xkb-dutch-keyboard-layout-fixes
 
+%patch9350 -p0 -b .render-tris-CVE-2006-1526
+
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
 # Update: Also enabled for FC3-testing build to be released soon, which will
 #         ultimately end up in an official FC3 update eventually as well.
@@ -1205,7 +1209,7 @@
 %patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513
 %patch9723 -p0 -b .security-CAN-2005-2495
 %patch9724 -p0 -b .shadow-framebuffer-leak.patch
-#%patch9725 -p0 -b .add-i945-support
+%patch9725 -p0 -b .add-i945-support
 %endif
 
 ########################################################################
@@ -3604,6 +3608,13 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri May 5 2006 Mike A. Harris <mharris at redhat.com> 6.8.2-37.FC4.49.4
+- Merge the xorg-x11-6.8.2-render-tris-CVE-2006-1526.patch patch into the FC-4
+  branch from the FC-4-embargoed branch, previously released as a security
+  update 6.8.2-37.FC4.49.2.1 based on the 6.8.2-37.FC4.49.2 build. (#190420)
+- Re-enable the xorg-x11-6.8.2-add-i945-support.patch disabled in previous
+  test build.
+
 * Fri Sep 23 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-37.FC4.49.3.test_no_i945.0
 - Temporarily disable the xorg-x11-6.8.2-add-i945-support.patch patch to try
   and narrow down regression possibilities for bug (#169093)