Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit b4ca229

Browse files
livecodefraserlivecodefraser
committed
Update zlib to version 1.2.8
This eliminates a number of reports from valgrind in the deflate implementation. This may have been a source of memory corruption when using revZip.
1 parent 8fd5a07 commit b4ca229

28 files changed

Lines changed: 4346 additions & 2291 deletions

‎libz/include/zconf.h‎

Lines changed: 234 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* zconf.h -- configuration of the zlib compression library
2-
* Copyright (C) 1995-2005 Jean-loup Gailly.
2+
* Copyright (C) 1995-2013 Jean-loup Gailly.
33
* For conditions of distribution and use, see copyright notice in zlib.h
44
*/
55

@@ -11,52 +11,145 @@
1111
/*
1212
* If you *really* need a unique prefix for all types and library functions,
1313
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
14+
* Even better than compiling with -DZ_PREFIX would be to use configure to set
15+
* this permanently in zconf.h using "./configure --zprefix".
1416
*/
15-
#ifdef Z_PREFIX
16-
# define deflateInit_ z_deflateInit_
17+
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18+
# define Z_PREFIX_SET
19+
20+
/* all linked symbols */
21+
# define _dist_code z__dist_code
22+
# define _length_code z__length_code
23+
# define _tr_align z__tr_align
24+
# define _tr_flush_bits z__tr_flush_bits
25+
# define _tr_flush_block z__tr_flush_block
26+
# define _tr_init z__tr_init
27+
# define _tr_stored_block z__tr_stored_block
28+
# define _tr_tally z__tr_tally
29+
# define adler32 z_adler32
30+
# define adler32_combine z_adler32_combine
31+
# define adler32_combine64 z_adler32_combine64
32+
# ifndef Z_SOLO
33+
# define compress z_compress
34+
# define compress2 z_compress2
35+
# define compressBound z_compressBound
36+
# endif
37+
# define crc32 z_crc32
38+
# define crc32_combine z_crc32_combine
39+
# define crc32_combine64 z_crc32_combine64
1740
# define deflate z_deflate
41+
# define deflateBound z_deflateBound
42+
# define deflateCopy z_deflateCopy
1843
# define deflateEnd z_deflateEnd
19-
# define inflateInit_ z_inflateInit_
20-
# define inflate z_inflate
21-
# define inflateEnd z_inflateEnd
2244
# define deflateInit2_ z_deflateInit2_
23-
# define deflateSetDictionary z_deflateSetDictionary
24-
# define deflateCopy z_deflateCopy
25-
# define deflateReset z_deflateReset
45+
# define deflateInit_ z_deflateInit_
2646
# define deflateParams z_deflateParams
27-
# define deflateBound z_deflateBound
47+
# define deflatePending z_deflatePending
2848
# define deflatePrime z_deflatePrime
49+
# define deflateReset z_deflateReset
50+
# define deflateResetKeep z_deflateResetKeep
51+
# define deflateSetDictionary z_deflateSetDictionary
52+
# define deflateSetHeader z_deflateSetHeader
53+
# define deflateTune z_deflateTune
54+
# define deflate_copyright z_deflate_copyright
55+
# define get_crc_table z_get_crc_table
56+
# ifndef Z_SOLO
57+
# define gz_error z_gz_error
58+
# define gz_intmax z_gz_intmax
59+
# define gz_strwinerror z_gz_strwinerror
60+
# define gzbuffer z_gzbuffer
61+
# define gzclearerr z_gzclearerr
62+
# define gzclose z_gzclose
63+
# define gzclose_r z_gzclose_r
64+
# define gzclose_w z_gzclose_w
65+
# define gzdirect z_gzdirect
66+
# define gzdopen z_gzdopen
67+
# define gzeof z_gzeof
68+
# define gzerror z_gzerror
69+
# define gzflush z_gzflush
70+
# define gzgetc z_gzgetc
71+
# define gzgetc_ z_gzgetc_
72+
# define gzgets z_gzgets
73+
# define gzoffset z_gzoffset
74+
# define gzoffset64 z_gzoffset64
75+
# define gzopen z_gzopen
76+
# define gzopen64 z_gzopen64
77+
# ifdef _WIN32
78+
# define gzopen_w z_gzopen_w
79+
# endif
80+
# define gzprintf z_gzprintf
81+
# define gzvprintf z_gzvprintf
82+
# define gzputc z_gzputc
83+
# define gzputs z_gzputs
84+
# define gzread z_gzread
85+
# define gzrewind z_gzrewind
86+
# define gzseek z_gzseek
87+
# define gzseek64 z_gzseek64
88+
# define gzsetparams z_gzsetparams
89+
# define gztell z_gztell
90+
# define gztell64 z_gztell64
91+
# define gzungetc z_gzungetc
92+
# define gzwrite z_gzwrite
93+
# endif
94+
# define inflate z_inflate
95+
# define inflateBack z_inflateBack
96+
# define inflateBackEnd z_inflateBackEnd
97+
# define inflateBackInit_ z_inflateBackInit_
98+
# define inflateCopy z_inflateCopy
99+
# define inflateEnd z_inflateEnd
100+
# define inflateGetHeader z_inflateGetHeader
29101
# define inflateInit2_ z_inflateInit2_
102+
# define inflateInit_ z_inflateInit_
103+
# define inflateMark z_inflateMark
104+
# define inflatePrime z_inflatePrime
105+
# define inflateReset z_inflateReset
106+
# define inflateReset2 z_inflateReset2
30107
# define inflateSetDictionary z_inflateSetDictionary
108+
# define inflateGetDictionary z_inflateGetDictionary
31109
# define inflateSync z_inflateSync
32110
# define inflateSyncPoint z_inflateSyncPoint
33-
# define inflateCopy z_inflateCopy
34-
# define inflateReset z_inflateReset
35-
# define inflateBack z_inflateBack
36-
# define inflateBackEnd z_inflateBackEnd
37-
# define compress z_compress
38-
# define compress2 z_compress2
39-
# define compressBound z_compressBound
40-
# define uncompress z_uncompress
41-
# define adler32 z_adler32
42-
# define crc32 z_crc32
43-
# define get_crc_table z_get_crc_table
111+
# define inflateUndermine z_inflateUndermine
112+
# define inflateResetKeep z_inflateResetKeep
113+
# define inflate_copyright z_inflate_copyright
114+
# define inflate_fast z_inflate_fast
115+
# define inflate_table z_inflate_table
116+
# ifndef Z_SOLO
117+
# define uncompress z_uncompress
118+
# endif
44119
# define zError z_zError
120+
# ifndef Z_SOLO
121+
# define zcalloc z_zcalloc
122+
# define zcfree z_zcfree
123+
# endif
124+
# define zlibCompileFlags z_zlibCompileFlags
125+
# define zlibVersion z_zlibVersion
45126

127+
/* all zlib typedefs in zlib.h and zconf.h */
128+
# define Byte z_Byte
129+
# define Bytef z_Bytef
46130
# define alloc_func z_alloc_func
131+
# define charf z_charf
47132
# define free_func z_free_func
133+
# ifndef Z_SOLO
134+
# define gzFile z_gzFile
135+
# endif
136+
# define gz_header z_gz_header
137+
# define gz_headerp z_gz_headerp
48138
# define in_func z_in_func
139+
# define intf z_intf
49140
# define out_func z_out_func
50-
# define Byte z_Byte
51141
# define uInt z_uInt
52-
# define uLong z_uLong
53-
# define Bytef z_Bytef
54-
# define charf z_charf
55-
# define intf z_intf
56142
# define uIntf z_uIntf
143+
# define uLong z_uLong
57144
# define uLongf z_uLongf
58-
# define voidpf z_voidpf
59145
# define voidp z_voidp
146+
# define voidpc z_voidpc
147+
# define voidpf z_voidpf
148+
149+
/* all zlib structs in zlib.h and zconf.h */
150+
# define gz_header_s z_gz_header_s
151+
# define internal_state z_internal_state
152+
60153
#endif
61154

62155
#if defined(__MSDOS__) && !defined(MSDOS)
@@ -125,6 +218,12 @@
125218
# endif
126219
#endif
127220

221+
#if defined(ZLIB_CONST) && !defined(z_const)
222+
# define z_const const
223+
#else
224+
# define z_const
225+
#endif
226+
128227
/* Some Mac compilers merge all .h files incorrectly: */
129228
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
130229
# define NO_DUMMY_DECL
@@ -171,6 +270,14 @@
171270
# endif
172271
#endif
173272

273+
#ifndef Z_ARG /* function prototypes for stdarg */
274+
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
275+
# define Z_ARG(args) args
276+
# else
277+
# define Z_ARG(args) ()
278+
# endif
279+
#endif
280+
174281
/* The following definitions for FAR are needed only for MSDOS mixed
175282
* model programming (small or medium model with some far allocations).
176283
* This was tested only with MSC; for other MSDOS compilers you may have
@@ -284,49 +391,121 @@ typedef uLong FAR uLongf;
284391
typedef Byte *voidp;
285392
#endif
286393

287-
#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
288-
# include <sys/types.h> /* for off_t */
289-
# include <unistd.h> /* for SEEK_* and off_t */
290-
# ifdef VMS
291-
# include <unixio.h> /* for off_t */
394+
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
395+
# include <limits.h>
396+
# if (UINT_MAX == 0xffffffffUL)
397+
# define Z_U4 unsigned
398+
# elif (ULONG_MAX == 0xffffffffUL)
399+
# define Z_U4 unsigned long
400+
# elif (USHRT_MAX == 0xffffffffUL)
401+
# define Z_U4 unsigned short
402+
# endif
403+
#endif
404+
405+
#ifdef Z_U4
406+
typedef Z_U4 z_crc_t;
407+
#else
408+
typedef unsigned long z_crc_t;
409+
#endif
410+
411+
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
412+
# define Z_HAVE_UNISTD_H
413+
#endif
414+
415+
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
416+
# define Z_HAVE_STDARG_H
417+
#endif
418+
419+
#ifdef STDC
420+
# ifndef Z_SOLO
421+
# include <sys/types.h> /* for off_t */
422+
# endif
423+
#endif
424+
425+
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
426+
# ifndef Z_SOLO
427+
# include <stdarg.h> /* for va_list */
292428
# endif
293-
# define z_off_t off_t
294429
#endif
295-
#ifndef SEEK_SET
430+
431+
#ifdef _WIN32
432+
# ifndef Z_SOLO
433+
# include <stddef.h> /* for wchar_t */
434+
# endif
435+
#endif
436+
437+
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
438+
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
439+
* though the former does not conform to the LFS document), but considering
440+
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
441+
* equivalently requesting no 64-bit operations
442+
*/
443+
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
444+
# undef _LARGEFILE64_SOURCE
445+
#endif
446+
447+
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
448+
# define Z_HAVE_UNISTD_H
449+
#endif
450+
#ifndef Z_SOLO
451+
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
452+
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
453+
# ifdef VMS
454+
# include <unixio.h> /* for off_t */
455+
# endif
456+
# ifndef z_off_t
457+
# define z_off_t off_t
458+
# endif
459+
# endif
460+
#endif
461+
462+
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
463+
# define Z_LFS64
464+
#endif
465+
466+
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
467+
# define Z_LARGE64
468+
#endif
469+
470+
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
471+
# define Z_WANT64
472+
#endif
473+
474+
#if !defined(SEEK_SET) && !defined(Z_SOLO)
296475
# define SEEK_SET 0 /* Seek from beginning of file. */
297476
# define SEEK_CUR 1 /* Seek from current position. */
298477
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
299478
#endif
479+
300480
#ifndef z_off_t
301481
# define z_off_t long
302482
#endif
303483

304-
#if defined(__OS400__)
305-
# define NO_vsnprintf
306-
#endif
307-
308-
#if defined(__MVS__)
309-
# define NO_vsnprintf
310-
# ifdef FAR
311-
# undef FAR
484+
#if !defined(_WIN32) && defined(Z_LARGE64)
485+
# define z_off64_t off64_t
486+
#else
487+
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
488+
# define z_off64_t __int64
489+
# else
490+
# define z_off64_t z_off_t
312491
# endif
313492
#endif
314493

315494
/* MVS linker does not support external names larger than 8 bytes */
316495
#if defined(__MVS__)
317-
# pragma map(deflateInit_,"DEIN")
318-
# pragma map(deflateInit2_,"DEIN2")
319-
# pragma map(deflateEnd,"DEEND")
320-
# pragma map(deflateBound,"DEBND")
321-
# pragma map(inflateInit_,"ININ")
322-
# pragma map(inflateInit2_,"ININ2")
323-
# pragma map(inflateEnd,"INEND")
324-
# pragma map(inflateSync,"INSY")
325-
# pragma map(inflateSetDictionary,"INSEDI")
326-
# pragma map(compressBound,"CMBND")
327-
# pragma map(inflate_table,"INTABL")
328-
# pragma map(inflate_fast,"INFA")
329-
# pragma map(inflate_copyright,"INCOPY")
496+
#pragma map(deflateInit_,"DEIN")
497+
#pragma map(deflateInit2_,"DEIN2")
498+
#pragma map(deflateEnd,"DEEND")
499+
#pragma map(deflateBound,"DEBND")
500+
#pragma map(inflateInit_,"ININ")
501+
#pragma map(inflateInit2_,"ININ2")
502+
#pragma map(inflateEnd,"INEND")
503+
#pragma map(inflateSync,"INSY")
504+
#pragma map(inflateSetDictionary,"INSEDI")
505+
#pragma map(compressBound,"CMBND")
506+
#pragma map(inflate_table,"INTABL")
507+
#pragma map(inflate_fast,"INFA")
508+
#pragma map(inflate_copyright,"INCOPY")
330509
#endif
331510

332511
#endif /* ZCONF_H */

0 commit comments

Comments
 (0)