From 3cd7d8a26c3af4e9a245193d95ea6fe5d153038e Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika <nebuleon.fumika@gmail.com>
Date: Wed, 29 Jan 2014 21:41:59 +0000
Subject: [PATCH] Guard Z_BZIP2ED with #ifdef HAVE_BZIP2 in miniunz.c, unzip.c

---
 unzip/miniunz.c |  2 ++
 unzip/unzip.c   | 18 ++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/unzip/miniunz.c b/unzip/miniunz.c
index b5bc8b54..db1ddd4f 100644
--- a/unzip/miniunz.c
+++ b/unzip/miniunz.c
@@ -215,11 +215,13 @@ int do_list(uf)
             else if ((iLevel==2) || (iLevel==3))
               string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
         }
+#ifdef HAVE_BZIP2
         else
         if (file_info.compression_method==Z_BZIP2ED)
         {
               string_method="BZip2 ";
         }
+#endif
         else
             string_method="Unkn. ";
 
diff --git a/unzip/unzip.c b/unzip/unzip.c
index 17d730d6..6ec52096 100644
--- a/unzip/unzip.c
+++ b/unzip/unzip.c
@@ -1013,9 +1013,9 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
         err=UNZ_BADZIPFILE;
 
     if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
+#ifdef HAVE_BZIP2
                          (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
+#endif
                          (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
@@ -1130,9 +1130,9 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     }
 
     if ((s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
+#ifdef HAVE_BZIP2
         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
+#endif
         (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
@@ -1146,10 +1146,10 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
 
     pfile_in_zip_read_info->stream.total_out = 0;
 
+#ifdef HAVE_BZIP2
     if ((s->cur_file_info.compression_method==Z_BZIP2ED) &&
         (!raw))
     {
-#ifdef HAVE_BZIP2
       pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
       pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
       pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
@@ -1169,11 +1169,9 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
         TRYFREE(pfile_in_zip_read_info);
         return err;
       }
-#else
-      pfile_in_zip_read_info->raw=1;
-#endif
     }
     else
+#endif
     if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
         (!raw))
     {
@@ -1385,10 +1383,10 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
             pfile_in_zip_read_info->stream.total_out += uDoCopy;
             iRead += uDoCopy;
         }
+#ifdef HAVE_BZIP2
         else
         if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
         {
-#ifdef HAVE_BZIP2
             uLong uTotalOutBefore,uTotalOutAfter;
             const Bytef *bufBefore;
             uLong uOutThis;
@@ -1430,8 +1428,8 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                 return (iRead==0) ? UNZ_EOF : iRead;
             if (err!=BZ_OK)
                 break;
-#endif
         }
+#endif
         else
         {
             uLong uTotalOutBefore,uTotalOutAfter;