From 2e99ea24ad005cbd9484346d36dd924ca72b7706 Mon Sep 17 00:00:00 2001 From: fvdl Date: Mon, 11 Mar 2002 23:40:14 +0000 Subject: [PATCH] Resolve (rcsid) conflicts. --- lib/libz/ChangeLog | 14 ++- lib/libz/README | 63 ++++++------ lib/libz/adler32.c | 7 +- lib/libz/algorithm.doc | 215 ----------------------------------------- lib/libz/compress.c | 6 +- lib/libz/crc32.c | 6 +- lib/libz/deflate.c | 10 +- lib/libz/deflate.h | 6 +- lib/libz/example.c | 6 +- lib/libz/gzio.c | 6 +- lib/libz/infblock.c | 13 ++- lib/libz/infblock.h | 4 +- lib/libz/infcodes.c | 14 +-- lib/libz/infcodes.h | 4 +- lib/libz/inffast.c | 49 ++++++---- lib/libz/inffast.h | 4 +- lib/libz/inflate.c | 4 +- lib/libz/inftrees.c | 11 +-- lib/libz/inftrees.h | 4 +- lib/libz/infutil.c | 4 +- lib/libz/infutil.h | 4 +- lib/libz/minigzip.c | 6 +- lib/libz/trees.c | 6 +- lib/libz/uncompr.c | 6 +- lib/libz/zconf.h | 6 +- lib/libz/zlib.h | 8 +- lib/libz/zutil.c | 4 +- lib/libz/zutil.h | 6 +- 28 files changed, 150 insertions(+), 346 deletions(-) delete mode 100644 lib/libz/algorithm.doc diff --git a/lib/libz/ChangeLog b/lib/libz/ChangeLog index afda124852ac..81d428c40e28 100644 --- a/lib/libz/ChangeLog +++ b/lib/libz/ChangeLog @@ -1,7 +1,17 @@ -$NetBSD: ChangeLog,v 1.5 1999/07/03 12:30:52 simonb Exp $ +$NetBSD: ChangeLog,v 1.6 2002/03/11 23:40:14 fvdl Exp $ ChangeLog file for zlib +Changes in 1.1.4 (11 March 2002) +- ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt +- Returned incorrect error (Z_MEM_ERROR) on some invalid data +- Avoid accesses before window for invalid distances with inflate window + less than 32K. +- force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + Changes in 1.1.3 (9 July 1998) - fix "an inflate input buffer bug that shows up on rare but persistent occasions" (Mark) @@ -216,7 +226,7 @@ Changes in 1.0.6 (19 Jan 1998) - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) - added makelcc.bat for lcc-win32 (Tom St Denis) - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) -- Avoid expanded $Id: ChangeLog,v 1.5 1999/07/03 12:30:52 simonb Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- Avoid expanded $Id: ChangeLog,v 1.6 2002/03/11 23:40:14 fvdl Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. - check for unistd.h in configure (for off_t) - remove useless check parameter in inflate_blocks_free - avoid useless assignment of s->check to itself in inflate_blocks_new diff --git a/lib/libz/README b/lib/libz/README index 328ab8c1d936..70036835277a 100644 --- a/lib/libz/README +++ b/lib/libz/README @@ -1,9 +1,9 @@ -$NetBSD: README,v 1.5 1999/07/03 12:30:52 simonb Exp $ +$NetBSD: README,v 1.6 2002/03/11 23:40:14 fvdl Exp $ -zlib 1.1.3 is a general purpose data compression library. All the code +zlib 1.1.4 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files -ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate +http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). These documents are also available in other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html @@ -16,51 +16,50 @@ except example.c and minigzip.c. To compile all files and run the test program, follow the instructions given at the top of Makefile. In short "make test; make install" -should work for most machines. For Unix: "configure; make test; make install" +should work for most machines. For Unix: "./configure; make test; make install" For MSDOS, use one of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or descrip.mms. -Questions about zlib should be sent to , or to +Questions about zlib should be sent to , or to Gilles Vollant for the Windows DLL version. -The zlib home page is http://www.cdrom.com/pub/infozip/zlib/ -The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/ -Before reporting a problem, please check those sites to verify that +The zlib home page is http://www.zlib.org or http://www.gzip.org/zlib/ +Before reporting a problem, please check this site to verify that you have the latest version of zlib; otherwise get the latest version and check whether the problem still exists or not. -Mark Nelson wrote an article about zlib for the Jan. 1997 +PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html +before asking for help. + +Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available in -http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm +http://dogma.net/markn/articles/zlibtool/zlibtool.htm -The changes made in version 1.1.3 are documented in the file ChangeLog. -The main changes since 1.1.2 are: +The changes made in version 1.1.4 are documented in the file ChangeLog. +The only changes made since 1.1.3 are bug corrections: -- fix "an inflate input buffer bug that shows up on rare but persistent - occasions" (Mark) -- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) -- fix gzseek(..., SEEK_SET) in write mode -- fix crc check after a gzeek (Frank Faubert) -- fix miniunzip when the last entry in a zip file is itself a zip file - (J Lillge) -- add contrib/asm586 and contrib/asm686 (Brian Raiter) - See http://www.muppetlabs.com/~breadbox/software/assembly.html -- add support for Delphi 3 in contrib/delphi (Bob Dellaca) -- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) -- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) -- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) -- added a FAQ file +- ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt +- Returned incorrect error (Z_MEM_ERROR) on some invalid data +- Avoid accesses before window for invalid distances with inflate window + less than 32K. +- force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + +The beta version 1.1.5beta includes many more changes. A new official +version 1.1.5 will be released as soon as extensive testing has been +completed on it. -plus many changes for portability. Unsupported third party contributions are provided in directory "contrib". -A Java implementation of zlib is available in the Java Development Kit 1.1 +A Java implementation of zlib is available in the Java Development Kit http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html -See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details. +See the zlib home page http://www.zlib.org for details. A Perl interface to zlib written by Paul Marquess -is in the CPAN (Comprehensive Perl Archive Network) sites, such as: -ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib* +is in the CPAN (Comprehensive Perl Archive Network) sites +http://www.cpan.org/modules/by-module/Compress/ A Python interface to zlib written by A.M. Kuchling is available in Python 1.5 and later versions, see @@ -119,7 +118,7 @@ Acknowledgments: Copyright notice: - (C) 1995-1998 Jean-loup Gailly and Mark Adler + (C) 1995-2002 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c index a7ab87e52363..96c663394d72 100644 --- a/lib/libz/adler32.c +++ b/lib/libz/adler32.c @@ -1,11 +1,10 @@ -/* $NetBSD: adler32.c,v 1.6 1999/07/03 12:30:52 simonb Exp $ */ - +/* $NetBSD: adler32.c,v 1.7 2002/03/11 23:40:14 fvdl 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.7 2002/03/11 23:40:14 fvdl Exp $ */ #include "zlib.h" diff --git a/lib/libz/algorithm.doc b/lib/libz/algorithm.doc deleted file mode 100644 index 0267d6c10813..000000000000 --- a/lib/libz/algorithm.doc +++ /dev/null @@ -1,215 +0,0 @@ -$NetBSD: algorithm.doc,v 1.5 1999/07/03 12:30:52 simonb Exp $ - -1. Compression algorithm (deflate) - -The deflation algorithm used by gzip (also zip and zlib) is a variation of -LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in -the input data. The second occurrence of a string is replaced by a -pointer to the previous string, in the form of a pair (distance, -length). Distances are limited to 32K bytes, and lengths are limited -to 258 bytes. When a string does not occur anywhere in the previous -32K bytes, it is emitted as a sequence of literal bytes. (In this -description, `string' must be taken as an arbitrary sequence of bytes, -and is not restricted to printable characters.) - -Literals or match lengths are compressed with one Huffman tree, and -match distances are compressed with another tree. The trees are stored -in a compact form at the start of each block. The blocks can have any -size (except that the compressed data for one block must fit in -available memory). A block is terminated when deflate() determines that -it would be useful to start another block with fresh trees. (This is -somewhat similar to the behavior of LZW-based _compress_.) - -Duplicated strings are found using a hash table. All input strings of -length 3 are inserted in the hash table. A hash index is computed for -the next 3 bytes. If the hash chain for this index is not empty, all -strings in the chain are compared with the current input string, and -the longest match is selected. - -The hash chains are searched starting with the most recent strings, to -favor small distances and thus take advantage of the Huffman encoding. -The hash chains are singly linked. There are no deletions from the -hash chains, the algorithm simply discards matches that are too old. - -To avoid a worst-case situation, very long hash chains are arbitrarily -truncated at a certain length, determined by a runtime option (level -parameter of deflateInit). So deflate() does not always find the longest -possible match but generally finds a match which is long enough. - -deflate() also defers the selection of matches with a lazy evaluation -mechanism. After a match of length N has been found, deflate() searches for -a longer match at the next input byte. If a longer match is found, the -previous match is truncated to a length of one (thus producing a single -literal byte) and the process of lazy evaluation begins again. Otherwise, -the original match is kept, and the next match search is attempted only N -steps later. - -The lazy match evaluation is also subject to a runtime parameter. If -the current match is long enough, deflate() reduces the search for a longer -match, thus speeding up the whole process. If compression ratio is more -important than speed, deflate() attempts a complete second search even if -the first match is already long enough. - -The lazy match evaluation is not performed for the fastest compression -modes (level parameter 1 to 3). For these fast modes, new strings -are inserted in the hash table only when no match was found, or -when the match is not too long. This degrades the compression ratio -but saves time since there are both fewer insertions and fewer searches. - - -2. Decompression algorithm (inflate) - -2.1 Introduction - -The real question is, given a Huffman tree, how to decode fast. The most -important realization is that shorter codes are much more common than -longer codes, so pay attention to decoding the short codes fast, and let -the long codes take longer to decode. - -inflate() sets up a first level table that covers some number of bits of -input less than the length of longest code. It gets that many bits from the -stream, and looks it up in the table. The table will tell if the next -code is that many bits or less and how many, and if it is, it will tell -the value, else it will point to the next level table for which inflate() -grabs more bits and tries to decode a longer code. - -How many bits to make the first lookup is a tradeoff between the time it -takes to decode and the time it takes to build the table. If building the -table took no time (and if you had infinite memory), then there would only -be a first level table to cover all the way to the longest code. However, -building the table ends up taking a lot longer for more bits since short -codes are replicated many times in such a table. What inflate() does is -simply to make the number of bits in the first table a variable, and set it -for the maximum speed. - -inflate() sends new trees relatively often, so it is possibly set for a -smaller first level table than an application that has only one tree for -all the data. For inflate, which has 286 possible codes for the -literal/length tree, the size of the first table is nine bits. Also the -distance trees have 30 possible values, and the size of the first table is -six bits. Note that for each of those cases, the table ended up one bit -longer than the ``average'' code length, i.e. the code length of an -approximately flat code which would be a little more than eight bits for -286 symbols and a little less than five bits for 30 symbols. It would be -interesting to see if optimizing the first level table for other -applications gave values within a bit or two of the flat code size. - - -2.2 More details on the inflate table lookup - -Ok, you want to know what this cleverly obfuscated inflate tree actually -looks like. You are correct that it's not a Huffman tree. It is simply a -lookup table for the first, let's say, nine bits of a Huffman symbol. The -symbol could be as short as one bit or as long as 15 bits. If a particular -symbol is shorter than nine bits, then that symbol's translation is duplicated -in all those entries that start with that symbol's bits. For example, if the -symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a -symbol is nine bits long, it appears in the table once. - -If the symbol is longer than nine bits, then that entry in the table points -to another similar table for the remaining bits. Again, there are duplicated -entries as needed. The idea is that most of the time the symbol will be short -and there will only be one table look up. (That's whole idea behind data -compression in the first place.) For the less frequent long symbols, there -will be two lookups. If you had a compression method with really long -symbols, you could have as many levels of lookups as is efficient. For -inflate, two is enough. - -So a table entry either points to another table (in which case nine bits in -the above example are gobbled), or it contains the translation for the symbol -and the number of bits to gobble. Then you start again with the next -ungobbled bit. - -You may wonder: why not just have one lookup table for how ever many bits the -longest symbol is? The reason is that if you do that, you end up spending -more time filling in duplicate symbol entries than you do actually decoding. -At least for deflate's output that generates new trees every several 10's of -kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code -would take too long if you're only decoding several thousand symbols. At the -other extreme, you could make a new table for every bit in the code. In fact, -that's essentially a Huffman tree. But then you spend two much time -traversing the tree while decoding, even for short symbols. - -So the number of bits for the first lookup table is a trade of the time to -fill out the table vs. the time spent looking at the second level and above of -the table. - -Here is an example, scaled down: - -The code being decoded, with 10 symbols, from 1 to 6 bits long: - -A: 0 -B: 10 -C: 1100 -D: 11010 -E: 11011 -F: 11100 -G: 11101 -H: 11110 -I: 111110 -J: 111111 - -Let's make the first table three bits long (eight entries): - -000: A,1 -001: A,1 -010: A,1 -011: A,1 -100: B,2 -101: B,2 -110: -> table X (gobble 3 bits) -111: -> table Y (gobble 3 bits) - -Each entry is what the bits decode to and how many bits that is, i.e. how -many bits to gobble. Or the entry points to another table, with the number of -bits to gobble implicit in the size of the table. - -Table X is two bits long since the longest code starting with 110 is five bits -long: - -00: C,1 -01: C,1 -10: D,2 -11: E,2 - -Table Y is three bits long since the longest code starting with 111 is six -bits long: - -000: F,2 -001: F,2 -010: G,2 -011: G,2 -100: H,2 -101: H,2 -110: I,3 -111: J,3 - -So what we have here are three tables with a total of 20 entries that had to -be constructed. That's compared to 64 entries for a single table. Or -compared to 16 entries for a Huffman tree (six two entry tables and one four -entry table). Assuming that the code ideally represents the probability of -the symbols, it takes on the average 1.25 lookups per symbol. That's compared -to one lookup for the single table, or 1.66 lookups per symbol for the -Huffman tree. - -There, I think that gives you a picture of what's going on. For inflate, the -meaning of a particular symbol is often more than just a letter. It can be a -byte (a "literal"), or it can be either a length or a distance which -indicates a base value and a number of bits to fetch after the code that is -added to the base value. Or it might be the special end-of-block code. The -data structures created in inftrees.c try to encode all that information -compactly in the tables. - - -Jean-loup Gailly Mark Adler -jloup@gzip.org madler@alumni.caltech.edu - - -References: - -[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data -Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3, -pp. 337-343. - -``DEFLATE Compressed Data Format Specification'' available in -ftp://ds.internic.net/rfc/rfc1951.txt diff --git a/lib/libz/compress.c b/lib/libz/compress.c index 664ff143ae63..3bd7d91dbdbe 100644 --- a/lib/libz/compress.c +++ b/lib/libz/compress.c @@ -1,11 +1,11 @@ -/* $NetBSD: compress.c,v 1.6 1999/07/03 12:30:52 simonb Exp $ */ +/* $NetBSD: compress.c,v 1.7 2002/03/11 23:40:16 fvdl 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.7 2002/03/11 23:40:16 fvdl Exp $ */ #include "zlib.h" diff --git a/lib/libz/crc32.c b/lib/libz/crc32.c index b62c97511ee3..0f9a31cf0969 100644 --- a/lib/libz/crc32.c +++ b/lib/libz/crc32.c @@ -1,11 +1,11 @@ -/* $NetBSD: crc32.c,v 1.7 2001/01/08 14:48:19 itojun Exp $ */ +/* $NetBSD: crc32.c,v 1.8 2002/03/11 23:40:16 fvdl Exp $ */ /* crc32.c -- compute the CRC-32 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: crc32.c,v 1.8 2002/03/11 23:40:16 fvdl Exp $ */ #include "zlib.h" diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c index 3ce48a306758..d121d67af004 100644 --- a/lib/libz/deflate.c +++ b/lib/libz/deflate.c @@ -1,7 +1,7 @@ -/* $NetBSD: deflate.c,v 1.7 2001/01/08 14:48:19 itojun Exp $ */ +/* $NetBSD: deflate.c,v 1.8 2002/03/11 23:40:17 fvdl Exp $ */ /* deflate.c -- compress data using the deflation algorithm - * 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 */ @@ -49,12 +49,12 @@ * */ -/* @(#) Id */ +/* @(#) $Id: deflate.c,v 1.8 2002/03/11 23:40:17 fvdl Exp $ */ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly "; + " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly "; /* 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 @@ -244,7 +244,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, windowBits = -windowBits; } if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + windowBits < 9 || windowBits > 15 || level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) { return Z_STREAM_ERROR; } diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h index bf64f79b7fec..6abea0f7f536 100644 --- a/lib/libz/deflate.h +++ b/lib/libz/deflate.h @@ -1,7 +1,7 @@ -/* $NetBSD: deflate.h,v 1.7 2001/01/08 14:48:19 itojun Exp $ */ +/* $NetBSD: deflate.h,v 1.8 2002/03/11 23:40:17 fvdl Exp $ */ /* deflate.h -- internal compression state - * 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 */ @@ -10,7 +10,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) Id */ +/* @(#) $Id: deflate.h,v 1.8 2002/03/11 23:40:17 fvdl Exp $ */ #ifndef _DEFLATE_H #define _DEFLATE_H diff --git a/lib/libz/example.c b/lib/libz/example.c index a83d52a42633..d1b9bfc761a1 100644 --- a/lib/libz/example.c +++ b/lib/libz/example.c @@ -1,11 +1,11 @@ -/* $NetBSD: example.c,v 1.8 2001/01/08 14:48:20 itojun Exp $ */ +/* $NetBSD: example.c,v 1.9 2002/03/11 23:40:17 fvdl Exp $ */ /* example.c -- usage example of the zlib compression library - * 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: example.c,v 1.9 2002/03/11 23:40:17 fvdl Exp $ */ #include #include "zlib.h" diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c index 0a8c278d03cd..5ff62c0afea9 100644 --- a/lib/libz/gzio.c +++ b/lib/libz/gzio.c @@ -1,13 +1,13 @@ -/* $NetBSD: gzio.c,v 1.11 2001/09/16 16:34:26 wiz Exp $ */ +/* $NetBSD: gzio.c,v 1.12 2002/03/11 23:40:17 fvdl Exp $ */ /* gzio.c -- IO on .gz files - * 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 * * Compile this file with -DNO_DEFLATE to avoid the compression code. */ -/* @(#) Id */ +/* @(#) $Id: gzio.c,v 1.12 2002/03/11 23:40:17 fvdl Exp $ */ #include diff --git a/lib/libz/infblock.c b/lib/libz/infblock.c index 718b735e4414..27995a79a5a1 100644 --- a/lib/libz/infblock.c +++ b/lib/libz/infblock.c @@ -1,7 +1,7 @@ -/* $NetBSD: infblock.c,v 1.5 1999/07/03 12:30:55 simonb Exp $ */ +/* $NetBSD: infblock.c,v 1.6 2002/03/11 23:40:18 fvdl Exp $ */ /* infblock.c -- interpret and process block types to last block - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -251,10 +251,12 @@ int r; &s->sub.trees.tb, s->hufts, z); if (t != Z_OK) { - ZFREE(z, s->sub.trees.blens); r = t; if (r == Z_DATA_ERROR) + { + ZFREE(z, s->sub.trees.blens); s->mode = BAD; + } LEAVE } s->sub.trees.index = 0; @@ -315,11 +317,13 @@ int r; t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), s->sub.trees.blens, &bl, &bd, &tl, &td, s->hufts, z); - ZFREE(z, s->sub.trees.blens); if (t != Z_OK) { if (t == (uInt)Z_DATA_ERROR) + { + ZFREE(z, s->sub.trees.blens); s->mode = BAD; + } r = t; LEAVE } @@ -331,6 +335,7 @@ int r; } s->sub.decode.codes = c; } + ZFREE(z, s->sub.trees.blens); s->mode = CODES; case CODES: UPDATE diff --git a/lib/libz/infblock.h b/lib/libz/infblock.h index 788f346ad488..568c445dcf85 100644 --- a/lib/libz/infblock.h +++ b/lib/libz/infblock.h @@ -1,7 +1,7 @@ -/* $NetBSD: infblock.h,v 1.6 2001/01/08 14:48:20 itojun Exp $ */ +/* $NetBSD: infblock.h,v 1.7 2002/03/11 23:40:18 fvdl 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 --git a/lib/libz/infcodes.c b/lib/libz/infcodes.c index f2b3bc8fcf7f..83f700fc5b44 100644 --- a/lib/libz/infcodes.c +++ b/lib/libz/infcodes.c @@ -1,7 +1,7 @@ -/* $NetBSD: infcodes.c,v 1.5 1999/07/03 12:30:56 simonb Exp $ */ +/* $NetBSD: infcodes.c,v 1.6 2002/03/11 23:40:18 fvdl Exp $ */ /* infcodes.c -- process literals and length/distance pairs - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -198,15 +198,9 @@ int r; Tracevv((stderr, "inflate: distance %u\n", c->sub.copy.dist)); c->mode = COPY; case COPY: /* o: copying bytes in window, waiting for space */ -#ifndef __TURBOC__ /* Turbo C bug for following expression */ - f = (uInt)(q - s->window) < c->sub.copy.dist ? - s->end - (c->sub.copy.dist - (q - s->window)) : - q - c->sub.copy.dist; -#else f = q - c->sub.copy.dist; - if ((uInt)(q - s->window) < c->sub.copy.dist) - f = s->end - (c->sub.copy.dist - (uInt)(q - s->window)); -#endif + while (f < s->window) /* modulo window size-"while" instead */ + f += s->end - s->window; /* of "if" handles invalid distances */ while (c->len) { NEEDOUT diff --git a/lib/libz/infcodes.h b/lib/libz/infcodes.h index 899ac798754f..c449b45153f1 100644 --- a/lib/libz/infcodes.h +++ b/lib/libz/infcodes.h @@ -1,7 +1,7 @@ -/* $NetBSD: infcodes.h,v 1.6 2001/01/08 14:48:20 itojun Exp $ */ +/* $NetBSD: infcodes.h,v 1.7 2002/03/11 23:40:19 fvdl 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 --git a/lib/libz/inffast.c b/lib/libz/inffast.c index 138a95f3ecec..3d3d20366abd 100644 --- a/lib/libz/inffast.c +++ b/lib/libz/inffast.c @@ -1,7 +1,7 @@ -/* $NetBSD: inffast.c,v 1.5 1999/07/03 12:30:56 simonb Exp $ */ +/* $NetBSD: inffast.c,v 1.6 2002/03/11 23:40:19 fvdl Exp $ */ /* inffast.c -- process literals and length/distance pairs fast - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -95,28 +95,41 @@ z_streamp z; /* do the copy */ m -= c; - if ((uInt)(q - s->window) >= d) /* offset before dest */ - { /* just copy */ - r = q - d; - *q++ = *r++; c--; /* minimum count is three, */ - *q++ = *r++; c--; /* so unroll loop a little */ - } - else /* else offset after destination */ + r = q - d; + if (r < s->window) /* wrap if needed */ { - e = d - (uInt)(q - s->window); /* bytes from offset to end */ - r = s->end - e; /* pointer to offset */ - if (c > e) /* if source crosses, */ + do { + r += s->end - s->window; /* force pointer in window */ + } while (r < s->window); /* covers invalid distances */ + e = s->end - r; + if (c > e) { - c -= e; /* copy to end of window */ + c -= e; /* wrapped copy */ do { - *q++ = *r++; + *q++ = *r++; } while (--e); - r = s->window; /* copy rest from start of window */ + r = s->window; + do { + *q++ = *r++; + } while (--c); + } + else /* normal copy */ + { + *q++ = *r++; c--; + *q++ = *r++; c--; + do { + *q++ = *r++; + } while (--c); } } - do { /* copy all or what's left */ - *q++ = *r++; - } while (--c); + else /* normal copy */ + { + *q++ = *r++; c--; + *q++ = *r++; c--; + do { + *q++ = *r++; + } while (--c); + } break; } else if ((e & 64) == 0) diff --git a/lib/libz/inffast.h b/lib/libz/inffast.h index d7116a8eeb7a..8cf493316769 100644 --- a/lib/libz/inffast.h +++ b/lib/libz/inffast.h @@ -1,7 +1,7 @@ -/* $NetBSD: inffast.h,v 1.6 2001/01/08 14:48:20 itojun Exp $ */ +/* $NetBSD: inffast.h,v 1.7 2002/03/11 23:40:19 fvdl 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 --git a/lib/libz/inflate.c b/lib/libz/inflate.c index 5ad0d4d32fc1..c38d38a81500 100644 --- a/lib/libz/inflate.c +++ b/lib/libz/inflate.c @@ -1,7 +1,7 @@ -/* $NetBSD: inflate.c,v 1.5 1999/07/03 12:30:56 simonb Exp $ */ +/* $NetBSD: inflate.c,v 1.6 2002/03/11 23:40:20 fvdl Exp $ */ /* inflate.c -- zlib interface to inflate modules - * 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 --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c index 62b92f83e4f5..898a8d6bdea7 100644 --- a/lib/libz/inftrees.c +++ b/lib/libz/inftrees.c @@ -1,7 +1,7 @@ -/* $NetBSD: inftrees.c,v 1.6 2001/01/08 14:48:20 itojun Exp $ */ +/* $NetBSD: inftrees.c,v 1.7 2002/03/11 23:40:20 fvdl 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 @@ uIntf *v; /* working area: values in order of bit length */ /* 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 @@ uIntf *v; /* working area: values in order of bit length */ /* 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 --git a/lib/libz/inftrees.h b/lib/libz/inftrees.h index ce52c40fdcab..6ce9e6929a40 100644 --- a/lib/libz/inftrees.h +++ b/lib/libz/inftrees.h @@ -1,7 +1,7 @@ -/* $NetBSD: inftrees.h,v 1.6 2001/01/08 14:48:21 itojun Exp $ */ +/* $NetBSD: inftrees.h,v 1.7 2002/03/11 23:40:21 fvdl 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 --git a/lib/libz/infutil.c b/lib/libz/infutil.c index da396af6fb47..e09ef4cba566 100644 --- a/lib/libz/infutil.c +++ b/lib/libz/infutil.c @@ -1,7 +1,7 @@ -/* $NetBSD: infutil.c,v 1.5 1999/07/03 12:30:57 simonb Exp $ */ +/* $NetBSD: infutil.c,v 1.6 2002/03/11 23:40:21 fvdl Exp $ */ /* inflate_util.c -- data and routines 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 --git a/lib/libz/infutil.h b/lib/libz/infutil.h index f974d3753c28..150715e30cd8 100644 --- a/lib/libz/infutil.h +++ b/lib/libz/infutil.h @@ -1,7 +1,7 @@ -/* $NetBSD: infutil.h,v 1.6 2001/01/08 14:48:21 itojun Exp $ */ +/* $NetBSD: infutil.h,v 1.7 2002/03/11 23:40:21 fvdl 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 --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c index 35fd38d8ac25..b55426c95ad4 100644 --- a/lib/libz/minigzip.c +++ b/lib/libz/minigzip.c @@ -1,7 +1,7 @@ -/* $NetBSD: minigzip.c,v 1.10 2001/01/08 14:48:21 itojun Exp $ */ +/* $NetBSD: minigzip.c,v 1.11 2002/03/11 23:40:22 fvdl Exp $ */ /* minigzip.c -- simulate gzip using the zlib compression library - * 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 */ @@ -17,7 +17,7 @@ /* from: Id: minigzip.c,v 1.10 1996/07/24 13:41:04 me Exp */ -/* @(#) Id */ +/* @(#) $Id: minigzip.c,v 1.11 2002/03/11 23:40:22 fvdl Exp $ */ #include diff --git a/lib/libz/trees.c b/lib/libz/trees.c index 8a266b216af3..5eea280007e6 100644 --- a/lib/libz/trees.c +++ b/lib/libz/trees.c @@ -1,7 +1,7 @@ -/* $NetBSD: trees.c,v 1.7 2001/01/08 14:48:22 itojun Exp $ */ +/* $NetBSD: trees.c,v 1.8 2002/03/11 23:40:22 fvdl Exp $ */ /* trees.c -- output deflated data using Huffman coding - * 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 */ @@ -31,7 +31,7 @@ * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* @(#) Id */ +/* @(#) $Id: trees.c,v 1.8 2002/03/11 23:40:22 fvdl Exp $ */ /* #define GEN_TREES_H */ diff --git a/lib/libz/uncompr.c b/lib/libz/uncompr.c index 4feb1c8cc4f4..513c7a2b1e2e 100644 --- a/lib/libz/uncompr.c +++ b/lib/libz/uncompr.c @@ -1,11 +1,11 @@ -/* $NetBSD: uncompr.c,v 1.6 1999/07/03 12:30:57 simonb Exp $ */ +/* $NetBSD: uncompr.c,v 1.7 2002/03/11 23:40:22 fvdl 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.7 2002/03/11 23:40:22 fvdl Exp $ */ #include "zlib.h" diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h index 0291a4c35019..f875cedfc53e 100644 --- a/lib/libz/zconf.h +++ b/lib/libz/zconf.h @@ -1,11 +1,11 @@ -/* $NetBSD: zconf.h,v 1.10 2001/01/08 14:53:19 itojun Exp $ */ +/* $NetBSD: zconf.h,v 1.11 2002/03/11 23:40:22 fvdl Exp $ */ /* zconf.h -- configuration of the zlib compression library - * 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: zconf.h,v 1.11 2002/03/11 23:40:22 fvdl Exp $ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/lib/libz/zlib.h b/lib/libz/zlib.h index 96eb35287fef..39762ffc0069 100644 --- a/lib/libz/zlib.h +++ b/lib/libz/zlib.h @@ -1,9 +1,9 @@ -/* $NetBSD: zlib.h,v 1.11 2001/01/08 14:48:22 itojun Exp $ */ +/* $NetBSD: zlib.h,v 1.12 2002/03/11 23:40:23 fvdl Exp $ */ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.3, July 9th, 1998 + version 1.1.4, March 11th, 2002 - Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -43,7 +43,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.1.3" +#define ZLIB_VERSION "1.1.4" /* The 'zlib' compression library provides in-memory compression and diff --git a/lib/libz/zutil.c b/lib/libz/zutil.c index 26a22bdacd3a..882adade4c06 100644 --- a/lib/libz/zutil.c +++ b/lib/libz/zutil.c @@ -1,7 +1,7 @@ -/* $NetBSD: zutil.c,v 1.7 2001/01/08 14:48:22 itojun Exp $ */ +/* $NetBSD: zutil.c,v 1.8 2002/03/11 23:40:23 fvdl Exp $ */ /* zutil.c -- target dependent utility functions for the compression library - * 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 */ diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h index a84905e614cf..72f14e16fcab 100644 --- a/lib/libz/zutil.h +++ b/lib/libz/zutil.h @@ -1,7 +1,7 @@ -/* $NetBSD: zutil.h,v 1.10 2001/01/08 14:48:23 itojun Exp $ */ +/* $NetBSD: zutil.h,v 1.11 2002/03/11 23:40:24 fvdl Exp $ */ /* zutil.h -- internal interface and configuration of the compression library - * 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 */ @@ -10,7 +10,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) Id */ +/* @(#) $Id: zutil.h,v 1.11 2002/03/11 23:40:24 fvdl Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H