ZipArchive: Update to the 4.6.9 release

9 files changed, 394 insertions, 449 deletions

diff --git a/zip/ZipArchive/bzip2/blocksort.c b/zip/ZipArchive/bzip2/blocksort.c
index 299bfd1..92d81fe 100644
--- a/zip/ZipArchive/bzip2/blocksort.c
+++ b/zip/ZipArchive/bzip2/blocksort.c
@@ -8,21 +8,19 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
-
 /*---------------------------------------------*/
 /*--- Fallback O(N log(N)^2) sorting        ---*/
 /*--- algorithm, for repetitive blocks      ---*/
@@ -204,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
       bhtab [ 0 .. 2+(nblock/32) ] destroyed
 */
 
-#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
-#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
+#define       SET_BH(zz)  bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
+#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
+#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
 #define      WORD_BH(zz)  bhtab[(zz) >> 5]
 #define UNALIGNED_BH(zz)  ((zz) & 0x01f)
 
@@ -1090,7 +1088,6 @@ void BZ2_blockSort ( EState* s )
    AssertH( s->origPtr != -1, 1003 );
 }
 
-#endif
 
 /*-------------------------------------------------------------*/
 /*--- end                                       blocksort.c ---*/
diff --git a/zip/ZipArchive/bzip2/bzcompress.c b/zip/ZipArchive/bzip2/bzcompress.c
index 2aef85d..97fe84e 100644
--- a/zip/ZipArchive/bzip2/bzcompress.c
+++ b/zip/ZipArchive/bzip2/bzcompress.c
@@ -8,14 +8,14 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
@@ -28,9 +28,10 @@
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
-
-
+// TD CHANGE: 
+#if _MSC_VER > 1000
+    #pragma warning (push)
+#endif
 /*---------------------------------------------------*/
 /*--- Bit stream I/O                              ---*/
 /*---------------------------------------------------*/
@@ -160,6 +161,8 @@ void generateMTFValues ( EState* s )
 
    wr = 0;
    zPend = 0;
+   // TD CHANGE: preventing uninitialized memory
+   memset(yy, 0, 256);
    for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
 
    for (i = 0; i < s->nblock; i++) {
@@ -204,6 +207,10 @@ void generateMTFValues ( EState* s )
                *ryy_j = rtmp2;
             };
             yy[0] = rtmp;
+ // TD CHANGE: 
+#if _MSC_VER > 1000
+#pragma warning (disable : 4244)
+#endif
             j = ryy_j - &(yy[0]);
             mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
          }
@@ -226,7 +233,10 @@ void generateMTFValues ( EState* s )
       };
       zPend = 0;
    }
-
+   // TD CHANGE: 
+#if _MSC_VER > 1000
+    #pragma warning (disable: 6385)
+#endif
    mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
 
    s->nMTF = wr;
@@ -456,7 +466,7 @@ void sendMTFValues ( EState* s )
 
    AssertH( nGroups < 8, 3002 );
    AssertH( nSelectors < 32768 &&
-            nSelectors <= (2 + (900000 / BZ_G_SIZE)),
+            nSelectors <= BZ_MAX_SELECTORS,
             3003 );
 
 
@@ -668,6 +678,9 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
    }
 }
 
+// TD CHANGE: 
+#if _MSC_VER > 1000
+    #pragma warning (pop)
 #endif
 
 /*-------------------------------------------------------------*/
diff --git a/zip/ZipArchive/bzip2/bzlib.c b/zip/ZipArchive/bzip2/bzlib.c
index 9e560da..25034d5 100644
--- a/zip/ZipArchive/bzip2/bzlib.c
+++ b/zip/ZipArchive/bzip2/bzlib.c
@@ -8,14 +8,14 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 /* CHANGES
@@ -29,8 +29,13 @@
 */
 
 #include "bzlib_private.h"
-
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
+// TD CHANGE: 
+#if _MSC_VER > 1000
+#pragma warning (push)
+#pragma warning (disable : 6386)
+#pragma warning (disable : 4267)
+#pragma warning (disable : 4996)
+#endif
 
 /*---------------------------------------------------*/
 /*--- Compression stuff                           ---*/
@@ -44,12 +49,12 @@ void BZ2_bz__AssertH__fail ( int errcode )
    fprintf(stderr, 
       "\n\nbzip2/libbzip2: internal error number %d.\n"
       "This is a bug in bzip2/libbzip2, %s.\n"
-      "Please report it to me at: jseward@bzip.org.  If this happened\n"
+      "Please report it to: bzip2-devel@sourceware.org.  If this happened\n"
       "when you were using some program which uses libbzip2 as a\n"
       "component, you should also report this bug to the author(s)\n"
       "of that program.  Please make an effort to report this bug;\n"
       "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 15 February 2005.\n\n",
+      "quality software.  Thanks.\n\n",
       errcode,
       BZ2_bzlibVersion()
    );
@@ -599,6 +604,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
       UInt32        c_tPos               = s->tPos;
       char*         cs_next_out          = s->strm->next_out;
       unsigned int  cs_avail_out         = s->strm->avail_out;
+      Int32         ro_blockSize100k     = s->blockSize100k;
       /* end restore */
 
       UInt32       avail_out_INIT = cs_avail_out;
@@ -1420,7 +1426,11 @@ BZFILE * bzopen_or_bzdopen
    if (open_mode==0) {
       if (path==NULL || strcmp(path,"")==0) {
         fp = (writing ? stdout : stdin);
-        SET_BINARY_MODE(fp);
+// TD CHANGE: 
+#if _MSC_VER > 1000
+    #pragma warning (disable : 6031)
+#endif
+      SET_BINARY_MODE(fp);
       } else {
         fp = fopen(path,mode2);
       }
@@ -1564,10 +1574,14 @@ const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
    *errnum = err;
    return bzerrorstrings[err*-1];
 }
+// TD CHANGE: 
+#if _MSC_VER > 1000
+    #pragma warning (pop)
 #endif
 
 #endif
 
+
 /*-------------------------------------------------------------*/
 /*--- end                                           bzlib.c ---*/
 /*-------------------------------------------------------------*/
diff --git a/zip/ZipArchive/bzip2/bzlib.h b/zip/ZipArchive/bzip2/bzlib.h
index 47f4ea9..8966a6c 100644
--- a/zip/ZipArchive/bzip2/bzlib.h
+++ b/zip/ZipArchive/bzip2/bzlib.h
@@ -1,379 +1,282 @@
-

-/*-------------------------------------------------------------*/

-/*--- Public header file for the library.                   ---*/

-/*---                                               bzlib.h ---*/

-/*-------------------------------------------------------------*/

-

-/* ------------------------------------------------------------------

-	This file is part of bzip2/libbzip2, a program and library for

-	lossless, block-sorting data compression.

-

-	bzip2/libbzip2 version 1.0.4 of 20 December 2006

-	Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>

-

-	This program, "bzip2", the associated library "libbzip2", and all

-	documentation, are copyright (C) 1996-2006 Julian R Seward.  All

-	rights reserved.

-

-	Redistribution and use in source and binary forms, with or without

-	modification, are permitted provided that the following conditions

-	are met:

-

-	1. Redistributions of source code must retain the above copyright

-	   notice, this list of conditions and the following disclaimer.

-

-	2. The origin of this software must not be misrepresented; you must 

-	   not claim that you wrote the original software.  If you use this 

-	   software in a product, an acknowledgment in the product 

-	   documentation would be appreciated but is not required.

-

-	3. Altered source versions must be plainly marked as such, and must

-	   not be misrepresented as being the original software.

-

-	4. The name of the author may not be used to endorse or promote 

-	   products derived from this software without specific prior written 

-	   permission.

-

-	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS

-	OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-	ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

-	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

-	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE

-	GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

-	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-	Julian Seward, Cambridge, UK.

-	jseward@bzip.org

-	bzip2/libbzip2 version 1.0.4 of 20 December 2006 

-

-	Please read and be aware of the following:

-

-	WARNING:

-

-	   This program and library (attempts to) compress data by 

-	   performing several non-trivial transformations on it.  

-	   Unless you are 100% familiar with *all* the algorithms 

-	   contained herein, and with the consequences of modifying them, 

-	   you should NOT meddle with the compression or decompression 

-	   machinery.  Incorrect changes can and very likely *will* 

-	   lead to disastrous loss of data.

-

-

-	DISCLAIMER:

-

-	   I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE

-	   USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.

-

-	   Every compression of a file implies an assumption that the

-	   compressed file can be decompressed to reproduce the original.

-	   Great efforts in design, coding and testing have been made to

-	   ensure that this program works correctly.  However, the complexity

-	   of the algorithms, and, in particular, the presence of various

-	   special cases in the code which occur with very low but non-zero

-	   probability make it impossible to rule out the possibility of bugs

-	   remaining in the program.  DO NOT COMPRESS ANY DATA WITH THIS

-	   PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER

-	   SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.

-

-	   That is not to say this program is inherently unreliable.  

-	   Indeed, I very much hope the opposite is true.  bzip2/libbzip2 

-	   has been carefully constructed and extensively tested.

-

-

-	PATENTS:

-

-	   To the best of my knowledge, bzip2/libbzip2 does not use any 

-	   patented algorithms.  However, I do not have the resources 

-	   to carry out a patent search.  Therefore I cannot give any 

-	   guarantee of the above statement.  

-   ------------------------------------------------------------------ */

-

-#include "../_features.h"

-

-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL

-

-#if _MSC_VER > 1000

-	#pragma warning (disable : 4244)

-	#pragma warning (disable : 4127)

-	#pragma warning (disable : 4100)

-	#pragma warning (disable : 4701)

-	#pragma warning (disable : 4702)

-	#pragma warning (disable : 4115)

-#endif

-

-#define BZ_NO_STDIO 1

-

-#ifndef _BZLIB_H

-#define _BZLIB_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define BZ_RUN               0

-#define BZ_FLUSH             1

-#define BZ_FINISH            2

-

-#define BZ_OK                0

-#define BZ_RUN_OK            1

-#define BZ_FLUSH_OK          2

-#define BZ_FINISH_OK         3

-#define BZ_STREAM_END        4

-#define BZ_SEQUENCE_ERROR    (-1)

-#define BZ_PARAM_ERROR       (-2)

-#define BZ_MEM_ERROR         (-3)

-#define BZ_DATA_ERROR        (-4)

-#define BZ_DATA_ERROR_MAGIC  (-5)

-#define BZ_IO_ERROR          (-6)

-#define BZ_UNEXPECTED_EOF    (-7)

-#define BZ_OUTBUFF_FULL      (-8)

-#define BZ_CONFIG_ERROR      (-9)

-

-typedef 

-   struct {

-      char *next_in;

-      unsigned int avail_in;

-      unsigned int total_in_lo32;

-      unsigned int total_in_hi32;

-

-      char *next_out;

-      unsigned int avail_out;

-      unsigned int total_out_lo32;

-      unsigned int total_out_hi32;

-

-      void *state;

-

-      void *(*bzalloc)(void *,int,int);

-      void (*bzfree)(void *,void *);

-      void *opaque;

-   } 

-   bz_stream;

-

-

-#ifndef BZ_IMPORT

-#define BZ_EXPORT

-#endif

-

-#ifndef BZ_NO_STDIO

-/* Need a definitition for FILE */

-#include <stdio.h>

-#endif

-

-#ifdef _WIN32

-#   include <windows.h>

-#   ifdef small

-      /* windows.h define small to char */

-#      undef small

-#   endif

-#   ifdef BZ_EXPORT

-#   define BZ_API(func) WINAPI func

-#   define BZ_EXTERN extern

-#   else

-   /* import windows dll dynamically */

-#   define BZ_API(func) (WINAPI * func)

-#   define BZ_EXTERN

-#   endif

-#else

-#   define BZ_API(func) func

-#   define BZ_EXTERN extern

-#endif

-

-

-/*-- Core (low-level) library functions --*/

-

-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 

-      bz_stream* strm, 

-      int        blockSize100k, 

-      int        verbosity, 

-      int        workFactor 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 

-      bz_stream* strm, 

-      int action 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 

-      bz_stream* strm 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 

-      bz_stream *strm, 

-      int       verbosity, 

-      int       small

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 

-      bz_stream* strm 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 

-      bz_stream *strm 

-   );

-

-

-

-/*-- High(er) level library functions --*/

-

-#ifndef BZ_NO_STDIO

-#define BZ_MAX_UNUSED 5000

-

-typedef void BZFILE;

-

-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 

-      int*  bzerror,   

-      FILE* f, 

-      int   verbosity, 

-      int   small,

-      void* unused,    

-      int   nUnused 

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 

-      int*    bzerror, 

-      BZFILE* b 

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 

-      int*    bzerror, 

-      BZFILE* b, 

-      void**  unused,  

-      int*    nUnused 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 

-      int*    bzerror, 

-      BZFILE* b, 

-      void*   buf, 

-      int     len 

-   );

-

-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 

-      int*  bzerror,      

-      FILE* f, 

-      int   blockSize100k, 

-      int   verbosity, 

-      int   workFactor 

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 

-      int*    bzerror, 

-      BZFILE* b, 

-      void*   buf, 

-      int     len 

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 

-      int*          bzerror, 

-      BZFILE*       b, 

-      int           abandon, 

-      unsigned int* nbytes_in, 

-      unsigned int* nbytes_out 

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 

-      int*          bzerror, 

-      BZFILE*       b, 

-      int           abandon, 

-      unsigned int* nbytes_in_lo32, 

-      unsigned int* nbytes_in_hi32, 

-      unsigned int* nbytes_out_lo32, 

-      unsigned int* nbytes_out_hi32

-   );

-#endif

-

-

-/*-- Utility functions --*/

-

-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 

-      char*         dest, 

-      unsigned int* destLen,

-      char*         source, 

-      unsigned int  sourceLen,

-      int           blockSize100k, 

-      int           verbosity, 

-      int           workFactor 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 

-      char*         dest, 

-      unsigned int* destLen,

-      char*         source, 

-      unsigned int  sourceLen,

-      int           small, 

-      int           verbosity 

-   );

-

-

-/*--

-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)

-   to support better zlib compatibility.

-   This code is not _officially_ part of libbzip2 (yet);

-   I haven't tested it, documented it, or considered the

-   threading-safeness of it.

-   If this code breaks, please contact both Yoshioka and me.

---*/

-

-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (

-      void

-   );

-

-#ifndef BZ_NO_STDIO

-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (

-      const char *path,

-      const char *mode

-   );

-

-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (

-      int        fd,

-      const char *mode

-   );

-         

-BZ_EXTERN int BZ_API(BZ2_bzread) (

-      BZFILE* b, 

-      void* buf, 

-      int len 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzwrite) (

-      BZFILE* b, 

-      void*   buf, 

-      int     len 

-   );

-

-BZ_EXTERN int BZ_API(BZ2_bzflush) (

-      BZFILE* b

-   );

-

-BZ_EXTERN void BZ_API(BZ2_bzclose) (

-      BZFILE* b

-   );

-

-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (

-      BZFILE *b, 

-      int    *errnum

-   );

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-#else

-

-#if _MSC_VER > 1000

-	#pragma warning (disable : 4206)

-#endif

-

-#endif

-

-

-/*-------------------------------------------------------------*/

-/*--- end                                           bzlib.h ---*/

-/*-------------------------------------------------------------*/

+
+/*-------------------------------------------------------------*/
+/*--- Public header file for the library.                   ---*/
+/*---                                               bzlib.h ---*/
+/*-------------------------------------------------------------*/
+
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
+
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
+
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
+
+
+#ifndef _BZLIB_H
+#define _BZLIB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BZ_RUN               0
+#define BZ_FLUSH             1
+#define BZ_FINISH            2
+
+#define BZ_OK                0
+#define BZ_RUN_OK            1
+#define BZ_FLUSH_OK          2
+#define BZ_FINISH_OK         3
+#define BZ_STREAM_END        4
+#define BZ_SEQUENCE_ERROR    (-1)
+#define BZ_PARAM_ERROR       (-2)
+#define BZ_MEM_ERROR         (-3)
+#define BZ_DATA_ERROR        (-4)
+#define BZ_DATA_ERROR_MAGIC  (-5)
+#define BZ_IO_ERROR          (-6)
+#define BZ_UNEXPECTED_EOF    (-7)
+#define BZ_OUTBUFF_FULL      (-8)
+#define BZ_CONFIG_ERROR      (-9)
+
+typedef 
+   struct {
+      char *next_in;
+      unsigned int avail_in;
+      unsigned int total_in_lo32;
+      unsigned int total_in_hi32;
+
+      char *next_out;
+      unsigned int avail_out;
+      unsigned int total_out_lo32;
+      unsigned int total_out_hi32;
+
+      void *state;
+
+      void *(*bzalloc)(void *,int,int);
+      void (*bzfree)(void *,void *);
+      void *opaque;
+   } 
+   bz_stream;
+
+
+#ifndef BZ_IMPORT
+#define BZ_EXPORT
+#endif
+
+#ifndef BZ_NO_STDIO
+/* Need a definitition for FILE */
+#include <stdio.h>
+#endif
+
+#ifdef _WIN32
+#   include <windows.h>
+#   ifdef small
+      /* windows.h define small to char */
+#      undef small
+#   endif
+#   ifdef BZ_EXPORT
+#   define BZ_API(func) WINAPI func
+#   define BZ_EXTERN extern
+#   else
+   /* import windows dll dynamically */
+#   define BZ_API(func) (WINAPI * func)
+#   define BZ_EXTERN
+#   endif
+#else
+#   define BZ_API(func) func
+#   define BZ_EXTERN extern
+#endif
+
+
+/*-- Core (low-level) library functions --*/
+
+BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
+      bz_stream* strm, 
+      int        blockSize100k, 
+      int        verbosity, 
+      int        workFactor 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
+      bz_stream* strm, 
+      int action 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
+      bz_stream* strm 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
+      bz_stream *strm, 
+      int       verbosity, 
+      int       small
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
+      bz_stream* strm 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
+      bz_stream *strm 
+   );
+
+
+
+/*-- High(er) level library functions --*/
+
+#ifndef BZ_NO_STDIO
+#define BZ_MAX_UNUSED 5000
+
+typedef void BZFILE;
+
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
+      int*  bzerror,   
+      FILE* f, 
+      int   verbosity, 
+      int   small,
+      void* unused,    
+      int   nUnused 
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
+      int*    bzerror, 
+      BZFILE* b 
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
+      int*    bzerror, 
+      BZFILE* b, 
+      void**  unused,  
+      int*    nUnused 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
+      int*    bzerror, 
+      BZFILE* b, 
+      void*   buf, 
+      int     len 
+   );
+
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
+      int*  bzerror,      
+      FILE* f, 
+      int   blockSize100k, 
+      int   verbosity, 
+      int   workFactor 
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
+      int*    bzerror, 
+      BZFILE* b, 
+      void*   buf, 
+      int     len 
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
+      int*          bzerror, 
+      BZFILE*       b, 
+      int           abandon, 
+      unsigned int* nbytes_in, 
+      unsigned int* nbytes_out 
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
+      int*          bzerror, 
+      BZFILE*       b, 
+      int           abandon, 
+      unsigned int* nbytes_in_lo32, 
+      unsigned int* nbytes_in_hi32, 
+      unsigned int* nbytes_out_lo32, 
+      unsigned int* nbytes_out_hi32
+   );
+#endif
+
+
+/*-- Utility functions --*/
+
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
+      char*         dest, 
+      unsigned int* destLen,
+      char*         source, 
+      unsigned int  sourceLen,
+      int           blockSize100k, 
+      int           verbosity, 
+      int           workFactor 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
+      char*         dest, 
+      unsigned int* destLen,
+      char*         source, 
+      unsigned int  sourceLen,
+      int           small, 
+      int           verbosity 
+   );
+
+
+/*--
+   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
+   to support better zlib compatibility.
+   This code is not _officially_ part of libbzip2 (yet);
+   I haven't tested it, documented it, or considered the
+   threading-safeness of it.
+   If this code breaks, please contact both Yoshioka and me.
+--*/
+
+BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
+      void
+   );
+
+#ifndef BZ_NO_STDIO
+BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
+      const char *path,
+      const char *mode
+   );
+
+BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
+      int        fd,
+      const char *mode
+   );
+         
+BZ_EXTERN int BZ_API(BZ2_bzread) (
+      BZFILE* b, 
+      void* buf, 
+      int len 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzwrite) (
+      BZFILE* b, 
+      void*   buf, 
+      int     len 
+   );
+
+BZ_EXTERN int BZ_API(BZ2_bzflush) (
+      BZFILE* b
+   );
+
+BZ_EXTERN void BZ_API(BZ2_bzclose) (
+      BZFILE* b
+   );
+
+BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
+      BZFILE *b, 
+      int    *errnum
+   );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*-------------------------------------------------------------*/
+/*--- end                                           bzlib.h ---*/
+/*-------------------------------------------------------------*/
diff --git a/zip/ZipArchive/bzip2/bzlib_private.h b/zip/ZipArchive/bzip2/bzlib_private.h
index 310ca97..3755a6f 100644
--- a/zip/ZipArchive/bzip2/bzlib_private.h
+++ b/zip/ZipArchive/bzip2/bzlib_private.h
@@ -8,21 +8,17 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
-#include "bzlib.h"
-
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
-
 #ifndef _BZLIB_PRIVATE_H
 #define _BZLIB_PRIVATE_H
 
@@ -34,10 +30,13 @@
 #include <string.h>
 #endif
 
+#include "bzlib.h"
+
+
 
 /*-- General stuff. --*/
 
-#define BZ_VERSION  "1.0.4, 20-Dec-2006"
+#define BZ_VERSION  "1.0.8, 13-Jul-2019"
 
 typedef char            Char;
 typedef unsigned char   Bool;
@@ -443,11 +442,15 @@ typedef
 /*-- Macros for decompression. --*/
 
 #define BZ_GET_FAST(cccc)                     \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
     s->tPos = s->tt[s->tPos];                 \
     cccc = (UChar)(s->tPos & 0xff);           \
     s->tPos >>= 8;
 
 #define BZ_GET_FAST_C(cccc)                   \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
     c_tPos = c_tt[c_tPos];                    \
     cccc = (UChar)(c_tPos & 0xff);            \
     c_tPos >>= 8;
@@ -470,8 +473,10 @@ typedef
    (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
 
 #define BZ_GET_SMALL(cccc)                            \
-      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-      s->tPos = GET_LL(s->tPos);
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
+    s->tPos = GET_LL(s->tPos);
 
 
 /*-- externs for decompression. --*/
@@ -496,9 +501,6 @@ BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
 #ifndef NULL
 #define NULL 0
 #endif
-
-#endif
-
 #endif
 
 
diff --git a/zip/ZipArchive/bzip2/crctable.c b/zip/ZipArchive/bzip2/crctable.c
index 0b36ab2..2b33c25 100644
--- a/zip/ZipArchive/bzip2/crctable.c
+++ b/zip/ZipArchive/bzip2/crctable.c
@@ -8,21 +8,19 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
-
 /*--
   I think this is an implementation of the AUTODIN-II,
   Ethernet & FDDI 32-bit CRC standard.  Vaguely derived
@@ -100,7 +98,6 @@ UInt32 BZ2_crc32Table[256] = {
    0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
 };
 
-#endif
 
 /*-------------------------------------------------------------*/
 /*--- end                                        crctable.c ---*/
diff --git a/zip/ZipArchive/bzip2/decompress.c b/zip/ZipArchive/bzip2/decompress.c
index 17f176d..a1a0bac 100644
--- a/zip/ZipArchive/bzip2/decompress.c
+++ b/zip/ZipArchive/bzip2/decompress.c
@@ -8,20 +8,19 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
 
 /*---------------------------------------------------*/
 static
@@ -286,7 +285,7 @@ Int32 BZ2_decompress ( DState* s )
 
       /*--- Now the selectors ---*/
       GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
-      if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+      if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
       GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
       if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
       for (i = 0; i < nSelectors; i++) {
@@ -297,8 +296,14 @@ Int32 BZ2_decompress ( DState* s )
             j++;
             if (j >= nGroups) RETURN(BZ_DATA_ERROR);
          }
-         s->selectorMtf[i] = j;
+         /* Having more than BZ_MAX_SELECTORS doesn't make much sense
+            since they will never be used, but some implementations might
+            "round up" the number of selectors, so just ignore those. */
+         if (i < BZ_MAX_SELECTORS)
+           s->selectorMtf[i] = j;
       }
+      if (nSelectors > BZ_MAX_SELECTORS)
+        nSelectors = BZ_MAX_SELECTORS;
 
       /*--- Undo the MTF values for the selectors. ---*/
       {
@@ -382,6 +387,13 @@ Int32 BZ2_decompress ( DState* s )
             es = -1;
             N = 1;
             do {
+               /* Check that N doesn't get too big, so that es doesn't
+                  go negative.  The maximum value that can be
+                  RUNA/RUNB encoded is equal to the block size (post
+                  the initial RLE), viz, 900k, so bounding N at 2
+                  million should guard against overflow without
+                  rejecting any legitimate inputs. */
+               if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR);
                if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
                if (nextSym == BZ_RUNB) es = es + (1+1) * N;
                N = N * 2;
@@ -486,15 +498,28 @@ Int32 BZ2_decompress ( DState* s )
          RETURN(BZ_DATA_ERROR);
 
       /*-- Set up cftab to facilitate generation of T^(-1) --*/
+      /* Check: unzftab entries in range. */
+      for (i = 0; i <= 255; i++) {
+         if (s->unzftab[i] < 0 || s->unzftab[i] > nblock)
+            RETURN(BZ_DATA_ERROR);
+      }
+      /* Actually generate cftab. */
       s->cftab[0] = 0;
       for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
       for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
+      /* Check: cftab entries in range. */
       for (i = 0; i <= 256; i++) {
          if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
             /* s->cftab[i] can legitimately be == nblock */
             RETURN(BZ_DATA_ERROR);
          }
       }
+      /* Check: cftab entries non-descending. */
+      for (i = 1; i <= 256; i++) {
+         if (s->cftab[i-1] > s->cftab[i]) {
+            RETURN(BZ_DATA_ERROR);
+         }
+      }
 
       s->state_out_len = 0;
       s->state_out_ch  = 0;
@@ -621,7 +646,6 @@ Int32 BZ2_decompress ( DState* s )
    return retVal;   
 }
 
-#endif
 
 /*-------------------------------------------------------------*/
 /*--- end                                      decompress.c ---*/
diff --git a/zip/ZipArchive/bzip2/huffman.c b/zip/ZipArchive/bzip2/huffman.c
index eb23368..43a1899 100644
--- a/zip/ZipArchive/bzip2/huffman.c
+++ b/zip/ZipArchive/bzip2/huffman.c
@@ -8,21 +8,19 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
-
 /*---------------------------------------------------*/
 #define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
 #define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
@@ -201,7 +199,6 @@ void BZ2_hbCreateDecodeTables ( Int32 *limit,
       base[i] = ((limit[i-1] + 1) << 1) - base[i];
 }
 
-#endif
 
 /*-------------------------------------------------------------*/
 /*--- end                                         huffman.c ---*/
diff --git a/zip/ZipArchive/bzip2/randtable.c b/zip/ZipArchive/bzip2/randtable.c
index 88ec1bf..bdc6d4a 100644
--- a/zip/ZipArchive/bzip2/randtable.c
+++ b/zip/ZipArchive/bzip2/randtable.c
@@ -8,20 +8,19 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   bzlib.h file.
+   README file.
 
    This program is released under the terms of the license contained
-   in the file bzlib.h.
+   in the file LICENSE.
    ------------------------------------------------------------------ */
 
 
 #include "bzlib_private.h"
 
-#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL
 
 /*---------------------------------------------*/
 Int32 BZ2_rNums[512] = { 
@@ -79,7 +78,6 @@ Int32 BZ2_rNums[512] = {
    936, 638
 };
 
-#endif
 
 /*-------------------------------------------------------------*/
 /*--- end                                       randtable.c ---*/