[zlib] Update zlib to 1.2.11

Fix opening of xlsx created by NPOI(bad-zip.xlsx)
xwiki-labs · Oct 10, 2018 · b7c8bc2 · b7c8bc2
1 parent 13900da
commit b7c8bc2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 33 deletions.
diff --git a/OfficeUtils/OfficeUtils.pri b/OfficeUtils/OfficeUtils.pri
@@ -11,43 +11,47 @@ build_zlib_as_sources {
 }
 
 INCLUDEPATH += \
-    $$PWD/src/zlib-1.2.3/contrib/minizip \
-    $$PWD/src/zlib-1.2.3
+    $$PWD/src/zlib-1.2.11/contrib/minizip \
+    $$PWD/src/zlib-1.2.11
 
 SOURCES +=  \
     $$PWD/src/OfficeUtils.cpp \
     $$PWD/src/ZipUtilsCP.cpp \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/ioapi.c \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/miniunz.c \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/minizip.c \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/mztools.c \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/unzip.c \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/zip.c
-
+    $$PWD/src/zlib-1.2.11/contrib/minizip/ioapi.c \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/miniunz.c \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/minizip.c \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/mztools.c \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/unzip.c \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/zip.c
+core_windows {
+SOURCES +=  \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/iowin32.c
+}
 build_all_zlib {
 SOURCES += \
-    $$PWD/src/zlib-1.2.3/adler32.c \
-    $$PWD/src/zlib-1.2.3/compress.c \
-    $$PWD/src/zlib-1.2.3/crc32.c \
-    $$PWD/src/zlib-1.2.3/deflate.c \
-    $$PWD/src/zlib-1.2.3/example.c \
-    $$PWD/src/zlib-1.2.3/gzio.c \
-    $$PWD/src/zlib-1.2.3/infback.c \
-    $$PWD/src/zlib-1.2.3/inffast.c \
-    $$PWD/src/zlib-1.2.3/inflate.c \
-    $$PWD/src/zlib-1.2.3/inftrees.c \
-    $$PWD/src/zlib-1.2.3/minigzip.c \
-    $$PWD/src/zlib-1.2.3/trees.c \
-    $$PWD/src/zlib-1.2.3/uncompr.c \
-    $$PWD/src/zlib-1.2.3/zutil.c
+    $$PWD/src/zlib-1.2.11/adler32.c \
+    $$PWD/src/zlib-1.2.11/compress.c \
+    $$PWD/src/zlib-1.2.11/crc32.c \
+    $$PWD/src/zlib-1.2.11/deflate.c \
+    $$PWD/src/zlib-1.2.11/gzclose.c \
+    $$PWD/src/zlib-1.2.11/gzlib.c \
+    $$PWD/src/zlib-1.2.11/gzread.c \
+    $$PWD/src/zlib-1.2.11/gzwrite.c \
+    $$PWD/src/zlib-1.2.11/infback.c \
+    $$PWD/src/zlib-1.2.11/inffast.c \
+    $$PWD/src/zlib-1.2.11/inflate.c \
+    $$PWD/src/zlib-1.2.11/inftrees.c \
+    $$PWD/src/zlib-1.2.11/trees.c \
+    $$PWD/src/zlib-1.2.11/uncompr.c \
+    $$PWD/src/zlib-1.2.11/zutil.c
 }	
 
 HEADERS +=  \
     $$PWD/src/OfficeUtilsCommon.h \
     $$PWD/src/OfficeUtils.h \
     $$PWD/src/ZipUtilsCP.h \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/crypt.h \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/ioapi.h \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/mztools.h \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/unzip.h \
-    $$PWD/src/zlib-1.2.3/contrib/minizip/zip.h
+    $$PWD/src/zlib-1.2.11/contrib/minizip/crypt.h \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/ioapi.h \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/mztools.h \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/unzip.h \
+    $$PWD/src/zlib-1.2.11/contrib/minizip/zip.h
diff --git a/OfficeUtils/src/ZipUtilsCP.cpp b/OfficeUtils/src/ZipUtilsCP.cpp
@@ -58,7 +58,9 @@ namespace ZLibZipUtils
 #endif
 
 #if defined(_WIN32) || defined (_WIN64)
-	  zipFile zf = zipOpen( filename, APPEND_STATUS_CREATE );
+	  zlib_filefunc64_def ffunc;
+	  fill_win32_filefunc64W(&ffunc);
+	  zipFile zf = zipOpen2_64(filename, APPEND_STATUS_CREATE, NULL, &ffunc);
 #else
 	  BYTE* pUtf8 = NULL;
 	  LONG lLen = 0;
@@ -78,7 +80,9 @@ namespace ZLibZipUtils
 #endif
 
 #if defined(_WIN32) || defined (_WIN64)
-	  unzFile uf = unzOpen (filename);
+	  zlib_filefunc64_def ffunc;
+	  fill_win32_filefunc64W(&ffunc);
+	  unzFile uf = unzOpen2_64(filename, &ffunc);
 #else
 	  BYTE* pUtf8 = NULL;
 	  LONG lLen = 0;

diff --git a/OfficeUtils/src/ZipUtilsCP.h b/OfficeUtils/src/ZipUtilsCP.h
@@ -47,9 +47,11 @@
 
 using namespace std;
 
-#include "zlib-1.2.3/contrib/minizip/unzip.h"
-#include "zlib-1.2.3/contrib/minizip/zip.h"
-
+#include "zlib-1.2.11/contrib/minizip/unzip.h"
+#include "zlib-1.2.11/contrib/minizip/zip.h"
+#if defined(_WIN32) || defined (_WIN64)
+	#include "zlib-1.2.11/contrib/minizip/iowin32.h"
+#endif
 #include <zlib.h>
 
 namespace ZLibZipUtils