summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--zlib/adler32.c4
-rw-r--r--zlib/compress.c4
-rw-r--r--zlib/crc32.c4
-rw-r--r--zlib/deflate.c8
-rw-r--r--zlib/deflate.h4
-rw-r--r--zlib/example.c4
-rw-r--r--zlib/gzio.c4
-rw-r--r--zlib/infblock.c3
-rw-r--r--zlib/infblock.h2
-rw-r--r--zlib/infcodes.h2
-rw-r--r--zlib/inffast.c80
-rw-r--r--zlib/inffast.h2
-rw-r--r--zlib/inflate.c2
-rw-r--r--zlib/inftrees.c9
-rw-r--r--zlib/inftrees.h2
-rw-r--r--zlib/infutil.c2
-rw-r--r--zlib/infutil.h2
-rw-r--r--zlib/maketree.c2
-rw-r--r--zlib/minigzip.c4
-rw-r--r--zlib/trees.c4
-rw-r--r--zlib/uncompr.c4
-rw-r--r--zlib/zconf.h4
-rw-r--r--zlib/zlib.h6
-rw-r--r--zlib/zutil.c4
-rw-r--r--zlib/zutil.h4
25 files changed, 90 insertions, 80 deletions
diff --git a/zlib/adler32.c b/zlib/adler32.c
index 72652e2bc..4dd542c6d 100644
--- a/zlib/adler32.c
+++ b/zlib/adler32.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: adler32.c,v 1.2 2001/11/22 21:12:46 jbj Exp $ */
+/* @(#) $Id: adler32.c,v 1.3 2001/12/27 21:00:17 jbj Exp $ */
/*
- * 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/zlib/compress.c b/zlib/compress.c
index 0dc458ec1..ba5d51a5a 100644
--- a/zlib/compress.c
+++ b/zlib/compress.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: compress.c,v 1.3 2001/12/27 21:00:17 jbj Exp $ */
+/* @(#) $Id: compress.c,v 1.4 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/crc32.c b/zlib/crc32.c
index 4608d0466..4087cbbf8 100644
--- a/zlib/crc32.c
+++ b/zlib/crc32.c
@@ -1,7 +1,7 @@
-/* @(#) $Id: crc32.c,v 1.5.2.1 2002/01/25 19:18:55 jbj Exp $ */
+/* @(#) $Id: crc32.c,v 1.6 2002/02/10 16:50:06 jbj Exp $ */
/*@-globs@*/
/*
- * 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/zlib/deflate.c b/zlib/deflate.c
index 51c3879bd..adba3d669 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: deflate.c,v 1.4.2.1 2002/01/25 19:18:55 jbj Exp $ */
+/* @(#) $Id: deflate.c,v 1.5 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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
*/
@@ -58,7 +58,7 @@
/*@-exportheadervar@*/
/*@unused@*/ /*@observer@*/
const char deflate_copyright[] =
- " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly ";
+ " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
/*@=exportheadervar@*/
/*
@@ -273,7 +273,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
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/zlib/deflate.h b/zlib/deflate.h
index 1dcd62f0d..c86bf6ea1 100644
--- a/zlib/deflate.h
+++ b/zlib/deflate.h
@@ -1,6 +1,6 @@
-/* @(#) $Id: deflate.h,v 1.4 2001/12/27 21:00:17 jbj Exp $ */
+/* @(#) $Id: deflate.h,v 1.5 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/example.c b/zlib/example.c
index 3a7460e9a..0d7524da3 100644
--- a/zlib/example.c
+++ b/zlib/example.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: example.c,v 1.1.1.1 2001/11/21 19:43:12 jbj Exp $ */
+/* @(#) $Id: example.c,v 1.2 2001/12/27 21:00:18 jbj Exp $ */
/*
- * 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/zlib/gzio.c b/zlib/gzio.c
index 15547e00a..0fb3876db 100644
--- a/zlib/gzio.c
+++ b/zlib/gzio.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: gzio.c,v 1.6.2.2 2002/01/30 00:30:45 jbj Exp $ */
+/* @(#) $Id: gzio.c,v 1.7 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/infblock.c b/zlib/infblock.c
index f7fe4dc2a..fc4624707 100644
--- a/zlib/infblock.c
+++ b/zlib/infblock.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -351,6 +351,7 @@ int inflate_blocks(inflate_blocks_statef *s, z_streamp z, int r)
}
s->sub.decode.codes = c;
}
+ ZFREE(z, s->sub.trees.blens);
s->mode = CODES;
/*@fallthrough@*/
case CODES:
diff --git a/zlib/infblock.h b/zlib/infblock.h
index a5143d9d7..9d8dea349 100644
--- a/zlib/infblock.h
+++ b/zlib/infblock.h
@@ -1,5 +1,5 @@
/*
- * 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/zlib/infcodes.h b/zlib/infcodes.h
index aff80598b..adcbcf2db 100644
--- a/zlib/infcodes.h
+++ b/zlib/infcodes.h
@@ -1,5 +1,5 @@
/*
- * 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/zlib/inffast.c b/zlib/inffast.c
index 0124d1b35..8dac29ce9 100644
--- a/zlib/inffast.c
+++ b/zlib/inffast.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -112,50 +112,60 @@ int ret;
/* do the copy */
m -= c;
#if 1 /* { */
- 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 */
- {
- e = d - (uInt)(q - s->window); /* bytes from offset to end */
- r = s->end - e; /* pointer to offset */
- if (c > e) /* if source crosses, */
+ r = q - d;
+ if (r < s->window) /* wrap if needed */
+ {
+ 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 */
#ifdef __i386__
- {int delta = (int)q - (int)r;
- if (delta <= 0 || delta > 3) {
- quickmemcpy(q, r, e);
- q += e;
- e = 0;
- goto rest;
- }
- }
+ { int delta = (int)q - (int)r;
+ if (delta <= 0 || delta > 3) {
+ quickmemcpy(q, r, e);
+ q += e;
+ e = 0;
+ goto rest;
+ }
+ }
#endif
do {
- *q++ = *r++;
+ *q++ = *r++;
} while (--e);
rest:
- r = s->window; /* copy rest from start of window */
+ r = s->window;
}
+ else /* normal copy */
+ {
+ *q++ = *r++; c--;
+ *q++ = *r++; c--;
+ do {
+ *q++ = *r++;
+ } while (--c);
+ }
+ }
+ else /* normal copy */
+ {
+ *q++ = *r++; c--;
+ *q++ = *r++; c--;
+ do {
+ *q++ = *r++;
+ } while (--c);
}
#ifdef __i386__
- {int delta = (int)q - (int)r;
- if (delta <= 0 || delta > 3) {
- quickmemcpy(q, r, c);
- q += c;
- r += c;
- c = 0;
- break;
- }
- }
+ { int delta = (int)q - (int)r;
+ if (delta <= 0 || delta > 3) {
+ quickmemcpy(q, r, c);
+ q += c;
+ r += c;
+ c = 0;
+ break;
+ }
+ }
#endif
- do { /* copy all or what's left */
- *q++ = *r++;
- } while (--c);
#endif /* } */
/*@innerbreak@*/ break;
}
diff --git a/zlib/inffast.h b/zlib/inffast.h
index 15c810aea..7e3ebb534 100644
--- a/zlib/inffast.h
+++ b/zlib/inffast.h
@@ -1,5 +1,5 @@
/*
- * 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/zlib/inflate.c b/zlib/inflate.c
index 8608b1eca..e1cd615fa 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -1,5 +1,5 @@
/*
- * 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/zlib/inftrees.c b/zlib/inftrees.c
index 6af13261f..2ac53c7d3 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -56,7 +56,7 @@
/*@-exportheadervar@*/
/*@unused@*/ /*@observer@*/
const char inflate_copyright[] =
- " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
+ " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
/*@=exportheadervar@*/
/* simplify the use of the inflate_huft type with some defines */
@@ -96,8 +96,7 @@ local const uInt cpdext[30] = { /* Extra bits for distance codes */
* 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. */
*
* @param b code lengths in bits (all assumed <= BMAX)
* @param n number of codes (assumed <= 288)
@@ -241,7 +240,7 @@ local int huft_build(uIntf *b, uInt n, uInt s, const uIntf *d,
/* 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/zlib/inftrees.h b/zlib/inftrees.h
index 331d17794..8e7da9336 100644
--- a/zlib/inftrees.h
+++ b/zlib/inftrees.h
@@ -1,5 +1,5 @@
/*
- * 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/zlib/infutil.c b/zlib/infutil.c
index b3d131086..2640de095 100644
--- a/zlib/infutil.c
+++ b/zlib/infutil.c
@@ -1,5 +1,5 @@
/*
- * 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/zlib/infutil.h b/zlib/infutil.h
index a03b04067..2a824c248 100644
--- a/zlib/infutil.h
+++ b/zlib/infutil.h
@@ -1,5 +1,5 @@
/*
- * 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/zlib/maketree.c b/zlib/maketree.c
index 8ebd406c7..f7516beb0 100644
--- a/zlib/maketree.c
+++ b/zlib/maketree.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/zlib/minigzip.c b/zlib/minigzip.c
index 25e3391cb..a217d15af 100644
--- a/zlib/minigzip.c
+++ b/zlib/minigzip.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: minigzip.c,v 1.2 2001/11/21 20:47:36 jbj Exp $ */
+/* @(#) $Id: minigzip.c,v 1.3 2001/12/27 21:00:18 jbj Exp $ */
/*
- * 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/zlib/trees.c b/zlib/trees.c
index 09a988f8d..3717412a6 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: trees.c,v 1.5 2001/12/27 21:00:18 jbj Exp $ */
+/* @(#) $Id: trees.c,v 1.6 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/uncompr.c b/zlib/uncompr.c
index 454495ecf..d7eaf2e4c 100644
--- a/zlib/uncompr.c
+++ b/zlib/uncompr.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: uncompr.c,v 1.3 2001/12/27 21:00:18 jbj Exp $ */
+/* @(#) $Id: uncompr.c,v 1.4 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/zconf.h b/zlib/zconf.h
index 1bd657b1b..b57a0c265 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -1,6 +1,6 @@
-/* @(#) $Id: zconf.h,v 1.3 2001/12/08 17:12:13 jbj Exp $ */
+/* @(#) $Id: zconf.h,v 1.4 2001/12/27 21:00:18 jbj Exp $ */
/*
- * 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/zlib/zlib.h b/zlib/zlib.h
index 1f2af85cd..a36adb06c 100644
--- a/zlib/zlib.h
+++ b/zlib/zlib.h
@@ -1,9 +1,9 @@
/**
* \file 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
@@ -59,7 +59,7 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.1.3"
+#define ZLIB_VERSION "1.1.4"
typedef /*@only@*/ voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size))
/*@*/;
diff --git a/zlib/zutil.c b/zlib/zutil.c
index 1b09a1544..7a3022138 100644
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: zutil.c,v 1.3 2001/12/27 21:00:18 jbj Exp $ */
+/* @(#) $Id: zutil.c,v 1.4 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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/zlib/zutil.h b/zlib/zutil.h
index 7b67ff0a0..2d53d185a 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
@@ -1,6 +1,6 @@
-/* @(#) $Id: zutil.h,v 1.4.2.1 2002/01/25 19:18:55 jbj Exp $ */
+/* @(#) $Id: zutil.h,v 1.5 2002/02/10 16:50:06 jbj Exp $ */
/*
- * 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
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:03:06 +0000