rpms/zlib/FC-3 zlib-1.2.1.2-can-2005-2096.patch, NONE, 1.1 zlib.spec, 1.14, 1.15

[fedora-cvs-commits redhat com]

Author: varekova

Update of /cvs/dist/rpms/zlib/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv24826

Modified Files:
	zlib.spec 
Added Files:
	zlib-1.2.1.2-can-2005-2096.patch 
Log Message:
 - fix bug 162392 - CAN-2005-2096


zlib-1.2.1.2-can-2005-2096.patch:
 inftrees.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zlib-1.2.1.2-can-2005-2096.patch ---
--- zlib-1.2.1.2/inftrees.c.overfl	2004-09-07 07:29:19.000000000 +0200
+++ zlib-1.2.1.2/inftrees.c	2005-07-07 10:39:09.592922800 +0200
@@ -134,7 +134,7 @@
         left -= count[len];
         if (left < 0) return -1;        /* over-subscribed */
     }
-    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
+    if (left > 0 && (type == CODES || max != 1))
         return -1;                      /* incomplete set */
 
     /* generate offsets into symbol table for each length for sorting */


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/FC-3/zlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- zlib.spec	12 Sep 2004 17:07:35 -0000	1.14
+++ zlib.spec	7 Jul 2005 09:58:22 -0000	1.15
@@ -1,10 +1,11 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.1.2
-Release: 1
+Release: 2.fc3
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
+Patch1: zlib-1.2.1.2-can-2005-2096.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 Prefix: %{_prefix}
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .make-test
+%patch1 -p1 -b .overfl
 
 %build
 
@@ -78,6 +80,9 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Thu Jul 7  2005 Ivana Varekova <varekova redhat com> 1.2.1.2-2.fc2
+- fix bug 162392 - CAN-2005-2096
+
 * Sun Sep 12 2004 Jeff Johnson <jbj redhat com> 1.2.1.2-1
 - update to 1.2.1.2 to fix 2 DoS problems (#131385).