diff options
author | kientzle <kientzle@FreeBSD.org> | 2005-04-24 17:11:32 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2005-04-24 17:11:32 +0000 |
commit | dcdd7970c32e380f850172d84335e45a41b37de8 (patch) | |
tree | c8863f4aa466b3a3ae0c692932613e378ffcbdd5 /lib/libz/inftrees.c | |
parent | 3178c167b530f4b9957d9cc1e8972feb3f876690 (diff) | |
download | FreeBSD-src-dcdd7970c32e380f850172d84335e45a41b37de8.zip FreeBSD-src-dcdd7970c32e380f850172d84335e45a41b37de8.tar.gz |
ZLib 1.2.2
Diffstat (limited to 'lib/libz/inftrees.c')
-rw-r--r-- | lib/libz/inftrees.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c index 3bb5639..8a896b2 100644 --- a/lib/libz/inftrees.c +++ b/lib/libz/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2003 Mark Adler + * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.1 Copyright 1995-2003 Mark Adler "; + " inflate 1.2.2 Copyright 1995-2004 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 @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 76, 66}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 198}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -114,7 +114,15 @@ unsigned short FAR *work; for (max = MAXBITS; max >= 1; max--) if (count[max] != 0) break; if (root > max) root = max; - if (max == 0) return -1; /* no codes! */ + if (max == 0) { /* no symbols to code at all */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)1; + this.val = (unsigned short)0; + *(*table)++ = this; /* make a table to force an error */ + *(*table)++ = this; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } for (min = 1; min <= MAXBITS; min++) if (count[min] != 0) break; if (root < min) root = min; @@ -295,7 +303,6 @@ unsigned short FAR *work; drop = 0; len = root; next = *table; - curr = root; this.bits = (unsigned char)len; } |