Date: Tue, 16 Nov 2021 04:42:32 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 135e04d15615 - main - multimedia/assimp: Update 5.0.1 -> 5.1.0 Message-ID: <202111160442.1AG4gWnt082868@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=135e04d156152f2f4982527c6f7023675135fc77 commit 135e04d156152f2f4982527c6f7023675135fc77 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-11-16 04:41:07 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-11-16 04:42:29 +0000 multimedia/assimp: Update 5.0.1 -> 5.1.0 Also: * add the 'test' target * update WWW --- benchmarks/vkmark/Makefile | 2 +- games/doomsday/Makefile | 2 +- games/pioneer/Makefile | 1 + graphics/magnum-extras/Makefile | 2 +- graphics/magnum-plugins/Makefile | 2 +- graphics/qt5-3d/Makefile | 2 +- misc/dartsim/Makefile | 2 +- multimedia/assimp/Makefile | 18 +- multimedia/assimp/distinfo | 6 +- multimedia/assimp/files/patch-contrib-zip | 1729 ----------------------------- multimedia/assimp/pkg-descr | 2 +- multimedia/assimp/pkg-plist | 18 +- 12 files changed, 30 insertions(+), 1756 deletions(-) diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile index 14c991a78c34..8a0d8d528e4b 100644 --- a/benchmarks/vkmark/Makefile +++ b/benchmarks/vkmark/Makefile @@ -1,7 +1,7 @@ PORTNAME= vkmark DISTVERSION= 2017.08-24 DISTVERSIONSUFFIX= -g53abc4f -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile index 2a5efdc02cf9..1a89b566f387 100644 --- a/games/doomsday/Makefile +++ b/games/doomsday/Makefile @@ -2,7 +2,7 @@ PORTNAME= doomsday PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index 2d54a1267134..49f1da899fef 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -2,6 +2,7 @@ PORTNAME= pioneer DISTVERSION= 20210723 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/graphics/magnum-extras/Makefile b/graphics/magnum-extras/Makefile index 6287356b6334..32a3eca27b01 100644 --- a/graphics/magnum-extras/Makefile +++ b/graphics/magnum-extras/Makefile @@ -1,7 +1,7 @@ PORTNAME= magnum-extras DISTVERSIONPREFIX= v DISTVERSION= 2019.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/magnum-plugins/Makefile b/graphics/magnum-plugins/Makefile index c2df95dd9aed..008ab029b7e5 100644 --- a/graphics/magnum-plugins/Makefile +++ b/graphics/magnum-plugins/Makefile @@ -1,7 +1,7 @@ PORTNAME= magnum-plugins DISTVERSIONPREFIX= v DISTVERSION= 2019.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 769eea582600..073c11b7d136 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index 44dca0fa9a4c..e2325c8c784d 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,7 +1,7 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 6722cb3d1786..1dc9ed3f869c 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,7 +1,6 @@ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 5.0.1 -PORTREVISION= 1 +DISTVERSION= 5.1.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -12,15 +11,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libminizip.so:archivers/minizip -USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig +USES= cmake:testing compiler:c++11-lib localbase:ldflags pkgconfig + USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_OFF= ASSIMP_BUILD_TESTS - -PLIST_SUB= VER2=${DISTVERSION:R} +CMAKE_OFF= ASSIMP_BUILD_TESTS +CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS -post-install: # rm the third-party lib installed by mistake: https://github.com/assimp/assimp/issues/1650 - @${RM} ${STAGEDIR}${PREFIX}/lib/libIrrXML.a +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${BUILD_WRKSRC}/bin/unit .include <bsd.port.mk> diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index 16d7dea2ee0e..11b6739cdb17 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579977205 -SHA256 (assimp-assimp-v5.0.1_GH0.tar.gz) = 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc -SIZE (assimp-assimp-v5.0.1_GH0.tar.gz) = 46607553 +TIMESTAMP = 1637032976 +SHA256 (assimp-assimp-v5.1.0_GH0.tar.gz) = b96f609bca45cc4747bf8ea4b696816ada484aed2812e60ea4d16aae18360b0b +SIZE (assimp-assimp-v5.1.0_GH0.tar.gz) = 48875899 diff --git a/multimedia/assimp/files/patch-contrib-zip b/multimedia/assimp/files/patch-contrib-zip deleted file mode 100644 index a1d0dd899da6..000000000000 --- a/multimedia/assimp/files/patch-contrib-zip +++ /dev/null @@ -1,1729 +0,0 @@ -Update contrib/zip to 0.1.18 to fix a build failure on 32 bit platforms. -This patch is a combination of two upstream patches [1][2] slightly -edited to fit FreeBSD conventions and to skip files not shipped in the -distribution. See upstream issue 2954 [3] for details. - -[1]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff -[2]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff -[3]: https://github.com/assimp/assimp/issues/2954 - -diff -u contrib/zip/CMakeLists.txt contrib/zip/CMakeLists.txt ---- contrib/zip/CMakeLists.txt -+++ contrib/zip/CMakeLists.txt -@@ -1,10 +1,14 @@ --cmake_minimum_required(VERSION 2.8) --project(zip) --enable_language(C) -+cmake_minimum_required(VERSION 3.0) -+ -+project(zip -+ LANGUAGES C -+ VERSION "0.1.18") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - -+option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) -+ - if (MSVC) -- # Use secure functions by defaualt and suppress warnings about "deprecated" functions -+ # Use secure functions by default and suppress warnings about "deprecated" functions - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") -@@ -17,23 +21,71 @@ - # zip - set(SRC src/miniz.h src/zip.h src/zip.c) - add_library(${PROJECT_NAME} ${SRC}) --target_include_directories(${PROJECT_NAME} INTERFACE src) -+target_include_directories(${PROJECT_NAME} PUBLIC -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> -+ $<INSTALL_INTERFACE:include> -+) - - # test - if (NOT CMAKE_DISABLE_TESTING) - enable_testing() - add_subdirectory(test) - find_package(Sanitizers) -- add_sanitizers(${PROJECT_NAME} test.exe) -- add_sanitizers(${PROJECT_NAME} test_miniz.exe) -+ add_sanitizers(${PROJECT_NAME} ${test_out}) - endif() - -+#### -+# Installation (https://github.com/forexample/package-example) { -+ -+set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+set(INCLUDE_INSTALL_DIR "include") -+ -+set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ -+# Configuration -+set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -+set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -+set(NAMESPACE "${PROJECT_NAME}::") -+ -+# Include module with fuction 'write_basic_package_version_file' -+include(CMakePackageConfigHelpers) -+ -+# Note: PROJECT_VERSION is used as a VERSION -+write_basic_package_version_file( -+ "${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion -+) -+ -+# Use variables: -+# * TARGETS_EXPORT_NAME -+# * PROJECT_NAME -+configure_package_config_file( -+ "cmake/Config.cmake.in" -+ "${PROJECT_CONFIG}" -+ INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+install( -+ FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+install( -+ EXPORT "${TARGETS_EXPORT_NAME}" -+ NAMESPACE "${NAMESPACE}" -+ DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+# } -+ - install(TARGETS ${PROJECT_NAME} -+ EXPORT ${TARGETS_EXPORT_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -- COMPONENT library) --install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION include) -+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} -+) -+install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION ${INCLUDE_INSTALL_DIR}/zip) - - # uninstall target (https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake) - if(NOT TARGET uninstall) -@@ -46,2 +98,11 @@ - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake) -+endif() -+ -+find_package(Doxygen) -+if(DOXYGEN_FOUND) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) -+ add_custom_target(doc -+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile -+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ COMMENT "Generating API documentation with Doxygen" VERBATIM) - endif() -diff -u contrib/zip/README.md contrib/zip/README.md ---- contrib/zip/README.md -+++ contrib/zip/README.md -@@ -1,10 +1,8 @@ - ### A portable (OSX/Linux/Windows), simple zip library written in C - This is done by hacking awesome [miniz](https://code.google.com/p/miniz) library and layering functions on top of the miniz v1.15 API. - --[](https://ci.appveyor.com/project/kuba--/zip) --[](https://travis-ci.org/kuba--/zip) -+[](https://github.com/kuba--/zip/actions?query=workflow%3Abuild) - [](https://github.com/kuba--/zip/releases) --[](https://codecov.io/gh/kuba--/zip) - - - # The Idea -@@ -71,7 +69,7 @@ - zip_extract("foo.zip", "/tmp", on_extract_entry, &arg); - ``` - --* Extract a zip entry into memory. -+* Extract a zip entry into memory. - ```c - void *buf = NULL; - size_t bufsize; -@@ -89,7 +87,7 @@ - free(buf); - ``` - --* Extract a zip entry into memory (no internal allocation). -+* Extract a zip entry into memory (no internal allocation). - ```c - unsigned char *buf; - size_t bufsize; -@@ -110,7 +108,7 @@ - free(buf); - ``` - --* Extract a zip entry into memory using callback. -+* Extract a zip entry into memory using callback. - ```c - struct buffer_t { - char *data; -@@ -144,7 +142,7 @@ - ``` - - --* Extract a zip entry into a file. -+* Extract a zip entry into a file. - ```c - struct zip_t *zip = zip_open("foo.zip", 0, 'r'); - { -@@ -157,7 +155,7 @@ - zip_close(zip); - ``` - --* List of all zip entries -+* List of all zip entries - ```c - struct zip_t *zip = zip_open("foo.zip", 0, 'r'); - int i, n = zip_total_entries(zip); -@@ -174,7 +172,7 @@ - zip_close(zip); - ``` - --## Bindings -+# Bindings - Compile zip library as a dynamic library. - ```shell - $ mkdir build -@@ -213,3 +211,50 @@ -+} -+``` -+ -+### Rust (ffi) -+```rust -+extern crate libc; -+use std::ffi::CString; -+ -+#[repr(C)] -+pub struct Zip { -+ _private: [u8; 0], -+} -+ -+#[link(name = "zip")] -+extern "C" { -+ fn zip_open(path: *const libc::c_char, level: libc::c_int, mode: libc::c_char) -> *mut Zip; -+ fn zip_close(zip: *mut Zip) -> libc::c_void; -+ -+ fn zip_entry_open(zip: *mut Zip, entryname: *const libc::c_char) -> libc::c_int; -+ fn zip_entry_close(zip: *mut Zip) -> libc::c_int; -+ fn zip_entry_write( -+ zip: *mut Zip, -+ buf: *const libc::c_void, -+ bufsize: libc::size_t, -+ ) -> libc::c_int; -+} -+ -+fn main() { -+ let path = CString::new("/tmp/test.zip").unwrap(); -+ let mode: libc::c_char = 'w' as libc::c_char; -+ -+ let entryname = CString::new("test.txt").unwrap(); -+ let content = "test content\0"; -+ -+ unsafe { -+ let zip: *mut Zip = zip_open(path.as_ptr(), 5, mode); -+ { -+ zip_entry_open(zip, entryname.as_ptr()); -+ { -+ let buf = content.as_ptr() as *const libc::c_void; -+ let bufsize = content.len() as libc::size_t; -+ zip_entry_write(zip, buf, bufsize); -+ } -+ zip_entry_close(zip); -+ } -+ zip_close(zip); -+ } - } - ``` - -unchanged: ---- contrib/zip/src/miniz.h -+++ contrib/zip/src/miniz.h -@@ -221,6 +221,7 @@ - #ifndef MINIZ_HEADER_INCLUDED - #define MINIZ_HEADER_INCLUDED - -+#include <stdint.h> - #include <stdlib.h> - - // Defines to completely disable specific portions of miniz.c: -@@ -284,7 +285,8 @@ - /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ - #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) - #if MINIZ_X86_OR_X64_CPU --/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ -+/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient -+ * integer loads and stores from unaligned addresses. */ - #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 - #define MINIZ_UNALIGNED_USE_MEMCPY - #else -@@ -354,6 +356,44 @@ enum { - MZ_FIXED = 4 - }; - -+/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or -+ * modify this enum. */ -+typedef enum { -+ MZ_ZIP_NO_ERROR = 0, -+ MZ_ZIP_UNDEFINED_ERROR, -+ MZ_ZIP_TOO_MANY_FILES, -+ MZ_ZIP_FILE_TOO_LARGE, -+ MZ_ZIP_UNSUPPORTED_METHOD, -+ MZ_ZIP_UNSUPPORTED_ENCRYPTION, -+ MZ_ZIP_UNSUPPORTED_FEATURE, -+ MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, -+ MZ_ZIP_NOT_AN_ARCHIVE, -+ MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, -+ MZ_ZIP_UNSUPPORTED_MULTIDISK, -+ MZ_ZIP_DECOMPRESSION_FAILED, -+ MZ_ZIP_COMPRESSION_FAILED, -+ MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, -+ MZ_ZIP_CRC_CHECK_FAILED, -+ MZ_ZIP_UNSUPPORTED_CDIR_SIZE, -+ MZ_ZIP_ALLOC_FAILED, -+ MZ_ZIP_FILE_OPEN_FAILED, -+ MZ_ZIP_FILE_CREATE_FAILED, -+ MZ_ZIP_FILE_WRITE_FAILED, -+ MZ_ZIP_FILE_READ_FAILED, -+ MZ_ZIP_FILE_CLOSE_FAILED, -+ MZ_ZIP_FILE_SEEK_FAILED, -+ MZ_ZIP_FILE_STAT_FAILED, -+ MZ_ZIP_INVALID_PARAMETER, -+ MZ_ZIP_INVALID_FILENAME, -+ MZ_ZIP_BUF_TOO_SMALL, -+ MZ_ZIP_INTERNAL_ERROR, -+ MZ_ZIP_FILE_NOT_FOUND, -+ MZ_ZIP_ARCHIVE_TOO_LARGE, -+ MZ_ZIP_VALIDATION_FAILED, -+ MZ_ZIP_WRITE_CALLBACK_FAILED, -+ MZ_ZIP_TOTAL_ERRORS -+} mz_zip_error; -+ - // Method - #define MZ_DEFLATED 8 - -@@ -696,6 +736,7 @@ typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, - void *pBuf, size_t n); - typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, - const void *pBuf, size_t n); -+typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); - - struct mz_zip_internal_state_tag; - typedef struct mz_zip_internal_state_tag mz_zip_internal_state; -@@ -707,13 +748,27 @@ typedef enum { - MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 - } mz_zip_mode; - --typedef struct mz_zip_archive_tag { -+typedef enum { -+ MZ_ZIP_TYPE_INVALID = 0, -+ MZ_ZIP_TYPE_USER, -+ MZ_ZIP_TYPE_MEMORY, -+ MZ_ZIP_TYPE_HEAP, -+ MZ_ZIP_TYPE_FILE, -+ MZ_ZIP_TYPE_CFILE, -+ MZ_ZIP_TOTAL_TYPES -+} mz_zip_type; -+ -+typedef struct { - mz_uint64 m_archive_size; - mz_uint64 m_central_directory_file_ofs; -- mz_uint m_total_files; -+ -+ /* We only support up to UINT32_MAX files in zip64 mode. */ -+ mz_uint32 m_total_files; - mz_zip_mode m_zip_mode; -+ mz_zip_type m_zip_type; -+ mz_zip_error m_last_error; - -- mz_uint m_file_offset_alignment; -+ mz_uint64 m_file_offset_alignment; - - mz_alloc_func m_pAlloc; - mz_free_func m_pFree; -@@ -722,6 +777,7 @@ typedef struct mz_zip_archive_tag { - - mz_file_read_func m_pRead; - mz_file_write_func m_pWrite; -+ mz_file_needs_keepalive m_pNeeds_keepalive; - void *m_pIO_opaque; - - mz_zip_internal_state *m_pState; -@@ -1263,6 +1319,9 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, - int strategy); - #endif // #ifndef MINIZ_NO_ZLIB_APIS - -+#define MZ_UINT16_MAX (0xFFFFU) -+#define MZ_UINT32_MAX (0xFFFFFFFFU) -+ - #ifdef __cplusplus - } - #endif -@@ -1311,6 +1370,11 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; - ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) - #endif - -+#define MZ_READ_LE64(p) \ -+ (((mz_uint64)MZ_READ_LE32(p)) | \ -+ (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) \ -+ << 32U)) -+ - #ifdef _MSC_VER - #define MZ_FORCEINLINE __forceinline - #elif defined(__GNUC__) -@@ -4160,6 +4224,17 @@ enum { - MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, - MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, -+ -+ /* ZIP64 archive identifier and record sizes */ -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, -+ MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, -+ MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, -+ MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, -+ MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, -+ - // Central directory header record offsets - MZ_ZIP_CDH_SIG_OFS = 0, - MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, -@@ -4199,6 +4274,31 @@ enum { - MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, - MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, - MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, -+ -+ /* ZIP64 End of central directory locator offsets */ -+ MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ -+ MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ -+ MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ -+ MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ -+ -+ /* ZIP64 End of central directory header offsets */ -+ MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ -+ MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ -+ MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ -+ MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ -+ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ -+ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ -+ MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ -+ MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, -+ MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 - }; - - typedef struct { -@@ -4211,7 +4311,24 @@ struct mz_zip_internal_state_tag { - mz_zip_array m_central_dir; - mz_zip_array m_central_dir_offsets; - mz_zip_array m_sorted_central_dir_offsets; -+ -+ /* The flags passed in when the archive is initially opened. */ -+ uint32_t m_init_flags; -+ -+ /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. -+ */ -+ mz_bool m_zip64; -+ -+ /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 -+ * will also be slammed to true too, even if we didn't find a zip64 end of -+ * central dir header, etc.) */ -+ mz_bool m_zip64_has_extended_info_fields; -+ -+ /* These fields are used by the file, FILE, memory, and memory/heap read/write -+ * helpers. */ - MZ_FILE *m_pFile; -+ mz_uint64 m_file_archive_start_ofs; -+ - void *m_pMem; - size_t m_mem_size; - size_t m_mem_capacity; -@@ -4363,6 +4480,13 @@ static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time, - #endif /* #ifndef MINIZ_NO_STDIO */ - #endif /* #ifndef MINIZ_NO_TIME */ - -+static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, -+ mz_zip_error err_num) { -+ if (pZip) -+ pZip->m_last_error = err_num; -+ return MZ_FALSE; -+} -+ - static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, - mz_uint32 flags) { - (void)flags; -@@ -4480,127 +4604,346 @@ mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) { - } - } - --static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, -- mz_uint32 flags) { -- mz_uint cdir_size, num_this_disk, cdir_disk_index; -- mz_uint64 cdir_ofs; -+static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, -+ mz_uint32 record_sig, -+ mz_uint32 record_size, -+ mz_int64 *pOfs) { - mz_int64 cur_file_ofs; -- const mz_uint8 *p; - mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; - mz_uint8 *pBuf = (mz_uint8 *)buf_u32; -- mz_bool sort_central_dir = -- ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); -- // Basic sanity checks - reject files which are too small, and check the first -- // 4 bytes of the file to make sure a local header is there. -- if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -+ -+ /* Basic sanity checks - reject files which are too small */ -+ if (pZip->m_archive_size < record_size) - return MZ_FALSE; -- // Find the end of central directory record by scanning the file from the end -- // towards the beginning. -+ -+ /* Find the record by scanning the file from the end towards the beginning. */ - cur_file_ofs = - MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); - for (;;) { - int i, - n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); -+ - if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) - return MZ_FALSE; -- for (i = n - 4; i >= 0; --i) -- if (MZ_READ_LE32(pBuf + i) == MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) -- break; -+ -+ for (i = n - 4; i >= 0; --i) { -+ mz_uint s = MZ_READ_LE32(pBuf + i); -+ if (s == record_sig) { -+ if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) -+ break; -+ } -+ } -+ - if (i >= 0) { - cur_file_ofs += i; - break; - } -+ -+ /* Give up if we've searched the entire file, or we've gone back "too far" -+ * (~64kb) */ - if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= -- (0xFFFF + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) -+ (MZ_UINT16_MAX + record_size))) - return MZ_FALSE; -+ - cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); - } -- // Read and verify the end of central directory record. -+ -+ *pOfs = cur_file_ofs; -+ return MZ_TRUE; -+} -+ -+static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, -+ mz_uint flags) { -+ mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, -+ cdir_disk_index = 0; -+ mz_uint64 cdir_ofs = 0; -+ mz_int64 cur_file_ofs = 0; -+ const mz_uint8 *p; -+ -+ mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; -+ mz_uint8 *pBuf = (mz_uint8 *)buf_u32; -+ mz_bool sort_central_dir = -+ ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); -+ mz_uint32 zip64_end_of_central_dir_locator_u32 -+ [(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / -+ sizeof(mz_uint32)]; -+ mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; -+ -+ mz_uint32 zip64_end_of_central_dir_header_u32 -+ [(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / -+ sizeof(mz_uint32)]; -+ mz_uint8 *pZip64_end_of_central_dir = -+ (mz_uint8 *)zip64_end_of_central_dir_header_u32; -+ -+ mz_uint64 zip64_end_of_central_dir_ofs = 0; -+ -+ /* Basic sanity checks - reject files which are too small, and check the first -+ * 4 bytes of the file to make sure a local header is there. */ -+ if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (!mz_zip_reader_locate_header_sig( -+ pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, -+ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) -+ return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); -+ -+ /* Read and verify the end of central directory record. */ - if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -- return MZ_FALSE; -- if ((MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != -- MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) || -- ((pZip->m_total_files = -- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS)) != -- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); -+ -+ if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != -+ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) { -+ if (pZip->m_pRead(pZip->m_pIO_opaque, -+ cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, -+ pZip64_locator, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) { -+ if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) { -+ zip64_end_of_central_dir_ofs = MZ_READ_LE64( -+ pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); -+ if (zip64_end_of_central_dir_ofs > -+ (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, -+ pZip64_end_of_central_dir, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) { -+ if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) { -+ pZip->m_pState->m_zip64 = MZ_TRUE; -+ } -+ } -+ } -+ } -+ } - -+ pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); -+ cdir_entries_on_this_disk = -+ MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); - num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); - cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); -+ cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); -+ cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); -+ -+ if (pZip->m_pState->m_zip64) { -+ mz_uint32 zip64_total_num_of_disks = -+ MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); -+ mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); -+ mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); -+ mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); -+ mz_uint64 zip64_size_of_central_directory = -+ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); -+ -+ if (zip64_size_of_end_of_central_dir_record < -+ (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ -+ if (zip64_total_num_of_disks != 1U) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); -+ -+ /* Check for miniz's practical limits */ -+ if (zip64_cdir_total_entries > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); -+ -+ pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; -+ -+ if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); -+ -+ cdir_entries_on_this_disk = -+ (mz_uint32)zip64_cdir_total_entries_on_this_disk; -+ -+ /* Check for miniz's current practical limits (sorry, this should be enough -+ * for millions of files) */ -+ if (zip64_size_of_central_directory > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); -+ -+ cdir_size = (mz_uint32)zip64_size_of_central_directory; -+ -+ num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + -+ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); -+ -+ cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + -+ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); -+ -+ cdir_ofs = -+ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); -+ } -+ -+ if (pZip->m_total_files != cdir_entries_on_this_disk) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); -+ - if (((num_this_disk | cdir_disk_index) != 0) && - ((num_this_disk != 1) || (cdir_disk_index != 1))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); - -- if ((cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS)) < -- pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) -- return MZ_FALSE; -+ if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); - -- cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); - if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); - - pZip->m_central_directory_file_ofs = cdir_ofs; - - if (pZip->m_total_files) { - mz_uint i, n; -- -- // Read the entire central directory into a heap block, and allocate another -- // heap block to hold the unsorted central dir file record offsets, and -- // another to hold the sorted indices. -+ /* Read the entire central directory into a heap block, and allocate another -+ * heap block to hold the unsorted central dir file record offsets, and -+ * possibly another to hold the sorted indices. */ - if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, - MZ_FALSE)) || - (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, - pZip->m_total_files, MZ_FALSE))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); - - if (sort_central_dir) { - if (!mz_zip_array_resize(pZip, - &pZip->m_pState->m_sorted_central_dir_offsets, - pZip->m_total_files, MZ_FALSE)) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); - } - - if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, - pZip->m_pState->m_central_dir.m_p, - cdir_size) != cdir_size) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); - -- // Now create an index into the central directory file records, do some -- // basic sanity checking on each record, and check for zip64 entries (which -- // are not yet supported). -+ /* Now create an index into the central directory file records, do some -+ * basic sanity checking on each record */ - p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; - for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) { -- mz_uint total_header_size, comp_size, decomp_size, disk_index; -+ mz_uint total_header_size, disk_index, bit_flags, filename_size, -+ ext_data_size; -+ mz_uint64 comp_size, decomp_size, local_header_ofs; -+ - if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || - (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ - MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, - i) = - (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); -+ - if (sort_central_dir) - MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, - mz_uint32, i) = i; -+ - comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); - decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); -- if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && -- (decomp_size != comp_size)) || -- (decomp_size && !comp_size) || (decomp_size == 0xFFFFFFFF) || -- (comp_size == 0xFFFFFFFF)) -- return MZ_FALSE; -+ local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); -+ filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); -+ ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); -+ -+ if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && -+ (ext_data_size) && -+ (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == -+ MZ_UINT32_MAX)) { -+ /* Attempt to find zip64 extended information field in the entry's extra -+ * data */ -+ mz_uint32 extra_size_remaining = ext_data_size; -+ -+ if (extra_size_remaining) { -+ const mz_uint8 *pExtra_data; -+ void *buf = NULL; -+ -+ if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > -+ n) { -+ buf = MZ_MALLOC(ext_data_size); -+ if (buf == NULL) -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); -+ -+ if (pZip->m_pRead(pZip->m_pIO_opaque, -+ cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + -+ filename_size, -+ buf, ext_data_size) != ext_data_size) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); -+ } -+ -+ pExtra_data = (mz_uint8 *)buf; -+ } else { -+ pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; -+ } -+ -+ do { -+ mz_uint32 field_id; -+ mz_uint32 field_data_size; -+ -+ if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ -+ field_id = MZ_READ_LE16(pExtra_data); -+ field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); -+ -+ if ((field_data_size + sizeof(mz_uint16) * 2) > -+ extra_size_remaining) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ -+ if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { -+ /* Ok, the archive didn't have any zip64 headers but it uses a -+ * zip64 extended information field so mark it as zip64 anyway -+ * (this can occur with infozip's zip util when it reads -+ * compresses files from stdin). */ -+ pZip->m_pState->m_zip64 = MZ_TRUE; -+ pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; -+ break; *** 1001 LINES SKIPPED ***
](https://travis-ci.org/kuba--/zip){kind=link}
](https://github.com/kuba--/zip/actions?query=workflow%3Abuild){kind=link}
](https://github.com/kuba--/zip/releases){kind=link}
](https://codecov.io/gh/kuba--/zip){kind=link}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111160442.1AG4gWnt082868>