aboutsummaryrefslogtreecommitdiff
path: root/zlib/inftrees.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 13:55:55 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 13:56:28 +0100
commit0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch)
treeeee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/inftrees.c
parent3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff)
parent4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff)
downloadvcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz
vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2
vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Updated zlib to 1.2.8 Conflicts: zlib/win32/zlib.def
Diffstat (limited to 'zlib/inftrees.c')
-rw-r--r--zlib/inftrees.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/zlib/inftrees.c b/zlib/inftrees.c
index b453aaf5b..4ccc909e0 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -1,5 +1,5 @@
/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2013 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -10,7 +10,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
+ " inflate 1.2.8 Copyright 1995-2013 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
@@ -63,7 +63,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, 78, 68};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
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,
@@ -209,8 +209,8 @@ unsigned short FAR *work;
mask = used - 1; /* mask for comparing low */
/* check available table space */
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
+ if ((type == LENS && used > ENOUGH_LENS) ||
+ (type == DISTS && used > ENOUGH_DISTS))
return 1;
/* process all codes and make table entries */
@@ -278,8 +278,8 @@ unsigned short FAR *work;
/* check for enough space */
used += 1U << curr;
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
+ if ((type == LENS && used > ENOUGH_LENS) ||
+ (type == DISTS && used > ENOUGH_DISTS))
return 1;
/* point entry in root table to sub-table */