[src/netbsd-1-5]: src/lib/libz Pull up revision 1.7 (requested by fvdl):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/673f938f8b48
branches:  netbsd-1-5
changeset: 492966:673f938f8b48
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 20 23:18:07 2002 +0000

description:
Pull up revision 1.7 (requested by fvdl):
  Upgrade libz to 1.1.4 due to a possible security bug.

diffstat:

 lib/libz/adler32.c  |   7 +++----
 lib/libz/compress.c |   6 +++---
 lib/libz/infblock.h |   4 ++--
 lib/libz/infcodes.h |   4 ++--
 lib/libz/inffast.h  |   4 ++--
 lib/libz/inftrees.c |  11 +++++------
 lib/libz/inftrees.h |   4 ++--
 lib/libz/infutil.h  |   4 ++--
 lib/libz/uncompr.c  |   6 +++---
 9 files changed, 24 insertions(+), 26 deletions(-)

diffs (160 lines):

diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/adler32.c
--- a/lib/libz/adler32.c        Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/adler32.c        Wed Mar 20 23:18:07 2002 +0000
@@ -1,11 +1,10 @@
-/* $NetBSD: adler32.c,v 1.6 1999/07/03 12:30:52 simonb Exp $ */
-
+/* $NetBSD: adler32.c,v 1.6.8.1 2002/03/20 23:18:07 he Exp $ */
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) Id */
+/* @(#) $Id: adler32.c,v 1.6.8.1 2002/03/20 23:18:07 he Exp $ */
 
 #include "zlib.h"
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/compress.c
--- a/lib/libz/compress.c       Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/compress.c       Wed Mar 20 23:18:07 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: compress.c,v 1.6 1999/07/03 12:30:52 simonb Exp $      */
+/*     $NetBSD: compress.c,v 1.6.8.1 2002/03/20 23:18:07 he Exp $      */
 
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) Id */
+/* @(#) $Id: compress.c,v 1.6.8.1 2002/03/20 23:18:07 he Exp $ */
 
 #include "zlib.h"
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/infblock.h
--- a/lib/libz/infblock.h       Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/infblock.h       Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: infblock.h,v 1.5 1999/07/03 12:30:55 simonb Exp $ */
+/* $NetBSD: infblock.h,v 1.5.8.1 2002/03/20 23:18:07 he Exp $ */
 
 /* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/infcodes.h
--- a/lib/libz/infcodes.h       Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/infcodes.h       Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: infcodes.h,v 1.5 1999/07/03 12:30:56 simonb Exp $ */
+/* $NetBSD: infcodes.h,v 1.5.8.1 2002/03/20 23:18:07 he Exp $ */
 
 /* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/inffast.h
--- a/lib/libz/inffast.h        Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/inffast.h        Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: inffast.h,v 1.5 1999/07/03 12:30:56 simonb Exp $ */
+/* $NetBSD: inffast.h,v 1.5.8.1 2002/03/20 23:18:07 he Exp $ */
 
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/inftrees.c
--- a/lib/libz/inftrees.c       Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/inftrees.c       Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: inftrees.c,v 1.5 1999/07/03 12:30:56 simonb Exp $ */
+/* $NetBSD: inftrees.c,v 1.5.8.1 2002/03/20 23:18:07 he Exp $ */
 
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -13,7 +13,7 @@
 #endif
 
 const char inflate_copyright[] =
-   " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
+   " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -106,8 +106,7 @@
 /* Given a list of code lengths and a maximum table size, make a set of
    tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
    if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
+   case), or Z_DATA_ERROR if the input is invalid. */
 {
 
   uInt a;                       /* counter for codes of length k */
@@ -233,7 +232,7 @@
 
         /* allocate new table */
         if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
+          return Z_DATA_ERROR;  /* overflow of MANY */
         u[h] = q = hp + *hn;
         *hn += z;
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/inftrees.h
--- a/lib/libz/inftrees.h       Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/inftrees.h       Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: inftrees.h,v 1.5 1999/07/03 12:30:57 simonb Exp $ */
+/* $NetBSD: inftrees.h,v 1.5.8.1 2002/03/20 23:18:08 he Exp $ */
 
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/infutil.h
--- a/lib/libz/infutil.h        Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/infutil.h        Wed Mar 20 23:18:07 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: infutil.h,v 1.5 1999/07/03 12:30:57 simonb Exp $ */
+/* $NetBSD: infutil.h,v 1.5.8.1 2002/03/20 23:18:08 he Exp $ */
 
 /* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
diff -r 80e680c44dcb -r 673f938f8b48 lib/libz/uncompr.c
--- a/lib/libz/uncompr.c        Wed Mar 20 23:18:04 2002 +0000
+++ b/lib/libz/uncompr.c        Wed Mar 20 23:18:07 2002 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: uncompr.c,v 1.6 1999/07/03 12:30:57 simonb Exp $ */
+/* $NetBSD: uncompr.c,v 1.6.8.1 2002/03/20 23:18:08 he Exp $ */
 
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) Id */
+/* @(#) $Id: uncompr.c,v 1.6.8.1 2002/03/20 23:18:08 he Exp $ */
 
 #include "zlib.h"