Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 1 | /* zip.c -- Zip manipulation |
Nathan Moinvaziri | db95894 | 2021-01-23 16:18:11 -0800 | [diff] [blame] | 2 | part of the minizip-ng project |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 3 | |
Nathan Moinvaziri | db95894 | 2021-01-23 16:18:11 -0800 | [diff] [blame] | 4 | Copyright (C) 2010-2021 Nathan Moinvaziri |
| 5 | https://github.com/zlib-ng/minizip-ng |
Nathan Moinvaziri | 79cfab0 | 2018-08-17 12:21:06 -0700 | [diff] [blame] | 6 | Copyright (C) 2009-2010 Mathias Svensson |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 7 | Modifications for Zip64 support |
| 8 | http://result42.com |
Nathan Moinvaziri | 79cfab0 | 2018-08-17 12:21:06 -0700 | [diff] [blame] | 9 | Copyright (C) 2007-2008 Even Rouault |
| 10 | Modifications of Unzip for Zip64 |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 11 | Copyright (C) 1998-2010 Gilles Vollant |
Viktor Szakats | 9dea6f2 | 2018-10-17 22:39:01 +0000 | [diff] [blame] | 12 | https://www.winimage.com/zLibDll/minizip.html |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 13 | |
| 14 | This program is distributed under the terms of the same license as zlib. |
| 15 | See the accompanying LICENSE file for the full text of the license. |
| 16 | */ |
| 17 | |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 18 | #include "mz.h" |
Nathan Moinvaziri | 5f09188 | 2018-10-24 18:06:08 -0700 | [diff] [blame] | 19 | #include "mz_crypt.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 20 | #include "mz_strm.h" |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 21 | #ifdef HAVE_BZIP2 |
| 22 | # include "mz_strm_bzip.h" |
| 23 | #endif |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 24 | #ifdef HAVE_LIBCOMP |
Nathan Moinvaziri | 90d31c7 | 2018-11-20 03:17:20 -0800 | [diff] [blame] | 25 | # include "mz_strm_libcomp.h" |
| 26 | #endif |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 27 | #ifdef HAVE_LZMA |
| 28 | # include "mz_strm_lzma.h" |
| 29 | #endif |
Nathan Moinvaziri | b47b41b | 2018-07-11 09:44:29 -0700 | [diff] [blame] | 30 | #include "mz_strm_mem.h" |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 31 | #ifdef HAVE_PKCRYPT |
| 32 | # include "mz_strm_pkcrypt.h" |
| 33 | #endif |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 34 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | 21a3102 | 2018-10-24 09:50:16 -0700 | [diff] [blame] | 35 | # include "mz_strm_wzaes.h" |
| 36 | #endif |
Nathan Moinvaziri | 4f6a0e3 | 2017-11-10 08:45:14 -0800 | [diff] [blame] | 37 | #ifdef HAVE_ZLIB |
| 38 | # include "mz_strm_zlib.h" |
| 39 | #endif |
Nathan Moinvaziri | 1f4758b | 2020-06-14 21:52:55 -0700 | [diff] [blame] | 40 | #ifdef HAVE_ZSTD |
| 41 | # include "mz_strm_zstd.h" |
| 42 | #endif |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 43 | |
| 44 | #include "mz_zip.h" |
| 45 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 46 | #include <ctype.h> /* tolower */ |
Nathan Moinvaziri | e849627 | 2018-11-21 15:05:58 -0800 | [diff] [blame] | 47 | #include <stdio.h> /* snprintf */ |
Nathan Moinvaziri | 1ee609b | 2018-11-19 21:34:35 -0800 | [diff] [blame] | 48 | |
zed | cf07666 | 2019-05-15 21:43:56 +0300 | [diff] [blame] | 49 | #if defined(_MSC_VER) || defined(__MINGW32__) |
Nathan Moinvaziri | 2e0a20a | 2019-04-28 13:03:11 -0700 | [diff] [blame] | 50 | # define localtime_r(t1,t2) (localtime_s(t2,t1) == 0 ? t1 : NULL) |
zed | 65447dd | 2019-05-16 22:19:08 +0300 | [diff] [blame] | 51 | #endif |
| 52 | #if defined(_MSC_VER) && (_MSC_VER < 1900) |
| 53 | # define snprintf _snprintf |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 54 | #endif |
| 55 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 56 | /***************************************************************************/ |
| 57 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 58 | #define MZ_ZIP_MAGIC_LOCALHEADER (0x04034b50) |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 59 | #define MZ_ZIP_MAGIC_LOCALHEADERU8 { 0x50, 0x4b, 0x03, 0x04 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 60 | #define MZ_ZIP_MAGIC_CENTRALHEADER (0x02014b50) |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 61 | #define MZ_ZIP_MAGIC_CENTRALHEADERU8 { 0x50, 0x4b, 0x01, 0x02 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 62 | #define MZ_ZIP_MAGIC_ENDHEADER (0x06054b50) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 63 | #define MZ_ZIP_MAGIC_ENDHEADERU8 { 0x50, 0x4b, 0x05, 0x06 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 64 | #define MZ_ZIP_MAGIC_ENDHEADER64 (0x06064b50) |
| 65 | #define MZ_ZIP_MAGIC_ENDLOCHEADER64 (0x07064b50) |
| 66 | #define MZ_ZIP_MAGIC_DATADESCRIPTOR (0x08074b50) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 67 | #define MZ_ZIP_MAGIC_DATADESCRIPTORU8 { 0x50, 0x4b, 0x07, 0x08 } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 68 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 69 | #define MZ_ZIP_SIZE_LD_ITEM (30) |
Nathan Moinvaziri | 638f31f | 2018-08-27 08:17:16 -0700 | [diff] [blame] | 70 | #define MZ_ZIP_SIZE_CD_ITEM (46) |
| 71 | #define MZ_ZIP_SIZE_CD_LOCATOR64 (20) |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 72 | #define MZ_ZIP_SIZE_MAX_DATA_DESCRIPTOR (24) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 73 | |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 74 | #define MZ_ZIP_OFFSET_CRC_SIZES (14) |
Nathan Moinvaziri | 161b266 | 2020-12-23 11:50:24 -0800 | [diff] [blame] | 75 | #define MZ_ZIP_UNCOMPR_SIZE64_CUSHION (2 * 1024 * 1024) |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 76 | |
Nathan Moinvaziri | c78c782 | 2018-12-01 20:42:36 -0800 | [diff] [blame] | 77 | #ifndef MZ_ZIP_EOCD_MAX_BACK |
| 78 | #define MZ_ZIP_EOCD_MAX_BACK (1 << 20) |
| 79 | #endif |
| 80 | |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 81 | /***************************************************************************/ |
| 82 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 83 | typedef struct mz_zip_s { |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 84 | mz_zip_file file_info; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 85 | mz_zip_file local_file_info; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 86 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 87 | void *stream; /* main stream */ |
| 88 | void *cd_stream; /* pointer to the stream with the cd */ |
| 89 | void *cd_mem_stream; /* memory stream for central directory */ |
| 90 | void *compress_stream; /* compression stream */ |
| 91 | void *crypt_stream; /* encryption stream */ |
| 92 | void *file_info_stream; /* memory stream for storing file info */ |
| 93 | void *local_file_info_stream; /* memory stream for storing local file info */ |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 94 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 95 | int32_t open_mode; |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 96 | uint8_t recover; |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 97 | uint8_t data_descriptor; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 98 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 99 | uint32_t disk_number_with_cd; /* number of the disk with the central dir */ |
| 100 | int64_t disk_offset_shift; /* correction for zips that have wrong offset start of cd */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 101 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 102 | int64_t cd_start_pos; /* pos of the first file in the central dir stream */ |
| 103 | int64_t cd_current_pos; /* pos of the current file in the central dir */ |
| 104 | int64_t cd_offset; /* offset of start of central directory */ |
| 105 | int64_t cd_size; /* size of the central directory */ |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 106 | uint32_t cd_signature; /* signature of central directory */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 107 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 108 | uint8_t entry_scanned; /* entry header information read ok */ |
| 109 | uint8_t entry_opened; /* entry is open for read/write */ |
| 110 | uint8_t entry_raw; /* entry opened with raw mode */ |
| 111 | uint32_t entry_crc32; /* entry crc32 */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 112 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 113 | uint64_t number_entry; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 114 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 115 | uint16_t version_madeby; |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 116 | char *comment; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 117 | } mz_zip; |
| 118 | |
| 119 | /***************************************************************************/ |
| 120 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 121 | #if 0 |
| 122 | # define mz_zip_print printf |
| 123 | #else |
| 124 | # define mz_zip_print(fmt,...) |
| 125 | #endif |
| 126 | |
| 127 | /***************************************************************************/ |
| 128 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 129 | /* Locate the end of central directory */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 130 | static int32_t mz_zip_search_eocd(void *stream, int64_t *central_pos) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 131 | int64_t file_size = 0; |
Nathan Moinvaziri | c78c782 | 2018-12-01 20:42:36 -0800 | [diff] [blame] | 132 | int64_t max_back = MZ_ZIP_EOCD_MAX_BACK; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 133 | uint8_t find[4] = MZ_ZIP_MAGIC_ENDHEADERU8; |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 134 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 135 | |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 136 | err = mz_stream_seek(stream, 0, MZ_SEEK_END); |
Nathan Moinvaziri | a93a2ad | 2018-11-13 17:51:42 -0800 | [diff] [blame] | 137 | if (err != MZ_OK) |
| 138 | return err; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 139 | |
| 140 | file_size = mz_stream_tell(stream); |
Nathan Moinvaziri | 286a817 | 2018-11-08 14:56:14 -0800 | [diff] [blame] | 141 | |
Nathan Moinvaziri | c78c782 | 2018-12-01 20:42:36 -0800 | [diff] [blame] | 142 | if (max_back <= 0 || max_back > file_size) |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 143 | max_back = file_size; |
| 144 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 145 | return mz_stream_find_reverse(stream, (const void *)find, sizeof(find), max_back, central_pos); |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 146 | } |
| 147 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 148 | /* Locate the end of central directory 64 of a zip file */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 149 | static int32_t mz_zip_search_zip64_eocd(void *stream, const int64_t end_central_offset, int64_t *central_pos) { |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 150 | int64_t offset = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 151 | uint32_t value32 = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 152 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 153 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 154 | *central_pos = 0; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 155 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 156 | /* Zip64 end of central directory locator */ |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 157 | err = mz_stream_seek(stream, end_central_offset - MZ_ZIP_SIZE_CD_LOCATOR64, MZ_SEEK_SET); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 158 | /* Read locator signature */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 159 | if (err == MZ_OK) { |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 160 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 161 | if (value32 != MZ_ZIP_MAGIC_ENDLOCHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 162 | err = MZ_FORMAT_ERROR; |
| 163 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 164 | /* Number of the disk with the start of the zip64 end of central directory */ |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 165 | if (err == MZ_OK) |
| 166 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 167 | /* Relative offset of the zip64 end of central directory record8 */ |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 168 | if (err == MZ_OK) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 169 | err = mz_stream_read_uint64(stream, (uint64_t *)&offset); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 170 | /* Total number of disks */ |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 171 | if (err == MZ_OK) |
| 172 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 173 | /* Goto end of central directory record */ |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 174 | if (err == MZ_OK) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 175 | err = mz_stream_seek(stream, (int64_t)offset, MZ_SEEK_SET); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 176 | /* The signature */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 177 | if (err == MZ_OK) { |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 178 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 00cca9f | 2017-10-16 07:37:11 -0700 | [diff] [blame] | 179 | if (value32 != MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 180 | err = MZ_FORMAT_ERROR; |
| 181 | } |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 182 | |
Nathan Moinvaziri | 3a0fb55 | 2017-10-10 12:47:48 -0700 | [diff] [blame] | 183 | if (err == MZ_OK) |
| 184 | *central_pos = offset; |
| 185 | |
| 186 | return err; |
Antoine Cœur | 0c2fceb | 2017-10-05 15:30:37 +0800 | [diff] [blame] | 187 | } |
| 188 | |
hekkihek | 15e2bb7 | 2022-07-16 16:31:21 +0200 | [diff] [blame] | 189 | #ifdef HAVE_PKCRYPT |
Nathan Moinvaziri | 215a7a8 | 2020-12-13 10:58:41 -0800 | [diff] [blame] | 190 | /* Get PKWARE traditional encryption verifier */ |
| 191 | static uint16_t mz_zip_get_pk_verify(uint32_t dos_date, uint64_t crc, uint16_t flag) |
| 192 | { |
Nathan Moinvaziri | 0030fa2 | 2020-12-21 19:31:07 -0800 | [diff] [blame] | 193 | /* Info-ZIP modification to ZipCrypto format: if bit 3 of the general |
Nathan Moinvaziri | 215a7a8 | 2020-12-13 10:58:41 -0800 | [diff] [blame] | 194 | * purpose bit flag is set, it uses high byte of 16-bit File Time. */ |
| 195 | if (flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) |
| 196 | return ((dos_date >> 16) & 0xff) << 8 | ((dos_date >> 8) & 0xff); |
| 197 | return ((crc >> 16) & 0xff) << 8 | ((crc >> 24) & 0xff); |
| 198 | } |
hekkihek | 15e2bb7 | 2022-07-16 16:31:21 +0200 | [diff] [blame] | 199 | #endif |
Nathan Moinvaziri | 215a7a8 | 2020-12-13 10:58:41 -0800 | [diff] [blame] | 200 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 201 | /* Get info about the current file in the zip file */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 202 | static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file *file_info, void *file_extra_stream) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 203 | uint64_t ntfs_time = 0; |
| 204 | uint32_t reserved = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 205 | uint32_t magic = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 206 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 207 | uint32_t field_pos = 0; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 208 | uint16_t field_type = 0; |
| 209 | uint16_t field_length = 0; |
| 210 | uint32_t field_length_read = 0; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 211 | uint16_t ntfs_attrib_id = 0; |
| 212 | uint16_t ntfs_attrib_size = 0; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 213 | uint16_t linkname_size; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 214 | uint16_t value16 = 0; |
| 215 | uint32_t value32 = 0; |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 216 | int64_t extrafield_pos = 0; |
| 217 | int64_t comment_pos = 0; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 218 | int64_t linkname_pos = 0; |
| 219 | int64_t saved_pos = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 220 | int32_t err = MZ_OK; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 221 | char *linkname = NULL; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 222 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 223 | memset(file_info, 0, sizeof(mz_zip_file)); |
| 224 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 225 | /* Check the magic */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 226 | err = mz_stream_read_uint32(stream, &magic); |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 227 | if (err == MZ_END_OF_STREAM) |
| 228 | err = MZ_END_OF_LIST; |
| 229 | else if (magic == MZ_ZIP_MAGIC_ENDHEADER || magic == MZ_ZIP_MAGIC_ENDHEADER64) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 230 | err = MZ_END_OF_LIST; |
| 231 | else if ((local) && (magic != MZ_ZIP_MAGIC_LOCALHEADER)) |
| 232 | err = MZ_FORMAT_ERROR; |
| 233 | else if ((!local) && (magic != MZ_ZIP_MAGIC_CENTRALHEADER)) |
| 234 | err = MZ_FORMAT_ERROR; |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 235 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 236 | /* Read header fields */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 237 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 238 | if (!local) |
| 239 | err = mz_stream_read_uint16(stream, &file_info->version_madeby); |
| 240 | if (err == MZ_OK) |
| 241 | err = mz_stream_read_uint16(stream, &file_info->version_needed); |
| 242 | if (err == MZ_OK) |
| 243 | err = mz_stream_read_uint16(stream, &file_info->flag); |
| 244 | if (err == MZ_OK) |
| 245 | err = mz_stream_read_uint16(stream, &file_info->compression_method); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 246 | if (err == MZ_OK) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 247 | err = mz_stream_read_uint32(stream, &dos_date); |
| 248 | file_info->modified_date = mz_zip_dosdate_to_time_t(dos_date); |
| 249 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 250 | if (err == MZ_OK) |
| 251 | err = mz_stream_read_uint32(stream, &file_info->crc); |
Nathan Moinvaziri | cf4029d | 2020-12-02 18:07:01 -0800 | [diff] [blame] | 252 | #ifdef HAVE_PKCRYPT |
Nathan Moinvaziri | 9ffb08e | 2020-11-30 21:30:10 -0800 | [diff] [blame] | 253 | if (err == MZ_OK && file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) { |
Nathan Moinvaziri | 215a7a8 | 2020-12-13 10:58:41 -0800 | [diff] [blame] | 254 | /* Use dos_date from header instead of derived from time in zip extensions */ |
| 255 | file_info->pk_verify = mz_zip_get_pk_verify(dos_date, file_info->crc, file_info->flag); |
Nathan Moinvaziri | 9ffb08e | 2020-11-30 21:30:10 -0800 | [diff] [blame] | 256 | } |
Nathan Moinvaziri | cf4029d | 2020-12-02 18:07:01 -0800 | [diff] [blame] | 257 | #endif |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 258 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 259 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 260 | file_info->compressed_size = value32; |
| 261 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 262 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 263 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 264 | file_info->uncompressed_size = value32; |
| 265 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 266 | if (err == MZ_OK) |
| 267 | err = mz_stream_read_uint16(stream, &file_info->filename_size); |
| 268 | if (err == MZ_OK) |
| 269 | err = mz_stream_read_uint16(stream, &file_info->extrafield_size); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 270 | if (!local) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 271 | if (err == MZ_OK) |
| 272 | err = mz_stream_read_uint16(stream, &file_info->comment_size); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 273 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 274 | err = mz_stream_read_uint16(stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 275 | file_info->disk_number = value16; |
| 276 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 277 | if (err == MZ_OK) |
| 278 | err = mz_stream_read_uint16(stream, &file_info->internal_fa); |
| 279 | if (err == MZ_OK) |
| 280 | err = mz_stream_read_uint32(stream, &file_info->external_fa); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 281 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 282 | err = mz_stream_read_uint32(stream, &value32); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 283 | file_info->disk_offset = value32; |
| 284 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 285 | } |
| 286 | } |
| 287 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 288 | if (err == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 289 | err = mz_stream_seek(file_extra_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 290 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 291 | /* Copy variable length data to memory stream for later retrieval */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 292 | if ((err == MZ_OK) && (file_info->filename_size > 0)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 293 | err = mz_stream_copy(file_extra_stream, stream, file_info->filename_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 294 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 295 | extrafield_pos = mz_stream_tell(file_extra_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 296 | |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 297 | if ((err == MZ_OK) && (file_info->extrafield_size > 0)) |
| 298 | err = mz_stream_copy(file_extra_stream, stream, file_info->extrafield_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 299 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 300 | |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 301 | comment_pos = mz_stream_tell(file_extra_stream); |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 302 | if ((err == MZ_OK) && (file_info->comment_size > 0)) |
| 303 | err = mz_stream_copy(file_extra_stream, stream, file_info->comment_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 304 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 305 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 306 | linkname_pos = mz_stream_tell(file_extra_stream); |
| 307 | /* Overwrite if we encounter UNIX1 extra block */ |
| 308 | mz_stream_write_uint8(file_extra_stream, 0); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 309 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 310 | if ((err == MZ_OK) && (file_info->extrafield_size > 0)) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 311 | /* Seek to and parse the extra field */ |
Nathan Moinvaziri | 69e3549 | 2018-11-05 15:48:41 -0800 | [diff] [blame] | 312 | err = mz_stream_seek(file_extra_stream, extrafield_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 313 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 314 | while ((err == MZ_OK) && (field_pos + 4 <= file_info->extrafield_size)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 315 | err = mz_zip_extrafield_read(file_extra_stream, &field_type, &field_length); |
Nathan Moinvaziri | ea2bd79 | 2018-11-19 17:44:44 -0800 | [diff] [blame] | 316 | if (err != MZ_OK) |
| 317 | break; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 318 | field_pos += 4; |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 319 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 320 | /* Don't allow field length to exceed size of remaining extrafield */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 321 | if (field_length > (file_info->extrafield_size - field_pos)) |
Nathan Moinvaziri | 1d6d183 | 2018-11-10 09:03:55 -0800 | [diff] [blame] | 322 | field_length = (uint16_t)(file_info->extrafield_size - field_pos); |
Nathan Moinvaziri | feb86c5 | 2018-11-05 11:40:21 -0800 | [diff] [blame] | 323 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 324 | /* Read ZIP64 extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 325 | if ((field_type == MZ_ZIP_EXTENSION_ZIP64) && (field_length >= 8)) { |
| 326 | if ((err == MZ_OK) && (file_info->uncompressed_size == UINT32_MAX)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 327 | err = mz_stream_read_int64(file_extra_stream, &file_info->uncompressed_size); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 328 | if (file_info->uncompressed_size < 0) |
| 329 | err = MZ_FORMAT_ERROR; |
| 330 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 331 | if ((err == MZ_OK) && (file_info->compressed_size == UINT32_MAX)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 332 | err = mz_stream_read_int64(file_extra_stream, &file_info->compressed_size); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 333 | if (file_info->compressed_size < 0) |
| 334 | err = MZ_FORMAT_ERROR; |
| 335 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 336 | if ((err == MZ_OK) && (file_info->disk_offset == UINT32_MAX)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 337 | err = mz_stream_read_int64(file_extra_stream, &file_info->disk_offset); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 338 | if (file_info->disk_offset < 0) |
| 339 | err = MZ_FORMAT_ERROR; |
| 340 | } |
juanii | 4ae7992 | 2018-02-11 14:29:36 -0300 | [diff] [blame] | 341 | if ((err == MZ_OK) && (file_info->disk_number == UINT16_MAX)) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 342 | err = mz_stream_read_uint32(file_extra_stream, &file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 343 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 344 | /* Read NTFS extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 345 | else if ((field_type == MZ_ZIP_EXTENSION_NTFS) && (field_length > 4)) { |
Nathan Moinvaziri | 7a3b698 | 2018-05-09 00:45:02 -0700 | [diff] [blame] | 346 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 347 | err = mz_stream_read_uint32(file_extra_stream, &reserved); |
| 348 | field_length_read = 4; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 349 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 350 | while ((err == MZ_OK) && (field_length_read + 4 <= field_length)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 351 | err = mz_stream_read_uint16(file_extra_stream, &ntfs_attrib_id); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 352 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 353 | err = mz_stream_read_uint16(file_extra_stream, &ntfs_attrib_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 354 | field_length_read += 4; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 355 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 356 | if ((err == MZ_OK) && (ntfs_attrib_id == 0x01) && (ntfs_attrib_size == 24)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 357 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 358 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->modified_date); |
| 359 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 360 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 361 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 362 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->accessed_date); |
| 363 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 364 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 365 | err = mz_stream_read_uint64(file_extra_stream, &ntfs_time); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 366 | mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->creation_date); |
| 367 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 368 | } else if ((err == MZ_OK) && (field_length_read + ntfs_attrib_size <= field_length)) { |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 369 | err = mz_stream_seek(file_extra_stream, ntfs_attrib_size, MZ_SEEK_CUR); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 370 | } |
| 371 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 372 | field_length_read += ntfs_attrib_size; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 373 | } |
| 374 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 375 | /* Read UNIX1 extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 376 | else if ((field_type == MZ_ZIP_EXTENSION_UNIX1) && (field_length >= 12)) { |
| 377 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 378 | err = mz_stream_read_uint32(file_extra_stream, &value32); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 379 | if (err == MZ_OK && file_info->accessed_date == 0) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 380 | file_info->accessed_date = value32; |
| 381 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 382 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 383 | err = mz_stream_read_uint32(file_extra_stream, &value32); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 384 | if (err == MZ_OK && file_info->modified_date == 0) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 385 | file_info->modified_date = value32; |
| 386 | } |
| 387 | if (err == MZ_OK) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 388 | err = mz_stream_read_uint16(file_extra_stream, &value16); /* User id */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 389 | if (err == MZ_OK) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 390 | err = mz_stream_read_uint16(file_extra_stream, &value16); /* Group id */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 391 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 392 | /* Copy linkname to end of file extra stream so we can return null |
| 393 | terminated string */ |
| 394 | linkname_size = field_length - 12; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 395 | if ((err == MZ_OK) && (linkname_size > 0)) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 396 | linkname = (char *)MZ_ALLOC(linkname_size); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 397 | if (linkname != NULL) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 398 | if (mz_stream_read(file_extra_stream, linkname, linkname_size) != linkname_size) |
| 399 | err = MZ_READ_ERROR; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 400 | if (err == MZ_OK) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 401 | saved_pos = mz_stream_tell(file_extra_stream); |
| 402 | |
| 403 | mz_stream_seek(file_extra_stream, linkname_pos, MZ_SEEK_SET); |
| 404 | mz_stream_write(file_extra_stream, linkname, linkname_size); |
| 405 | mz_stream_write_uint8(file_extra_stream, 0); |
| 406 | |
| 407 | mz_stream_seek(file_extra_stream, saved_pos, MZ_SEEK_SET); |
| 408 | } |
| 409 | MZ_FREE(linkname); |
| 410 | } |
| 411 | } |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 412 | } |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 413 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 414 | /* Read AES extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 415 | else if ((field_type == MZ_ZIP_EXTENSION_AES) && (field_length == 7)) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 416 | uint8_t value8 = 0; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 417 | /* Verify version info */ |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 418 | err = mz_stream_read_uint16(file_extra_stream, &value16); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 419 | /* Support AE-1 and AE-2 */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 420 | if (value16 != 1 && value16 != 2) |
| 421 | err = MZ_FORMAT_ERROR; |
| 422 | file_info->aes_version = value16; |
| 423 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 424 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 425 | if ((char)value8 != 'A') |
| 426 | err = MZ_FORMAT_ERROR; |
| 427 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 428 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 429 | if ((char)value8 != 'E') |
| 430 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 431 | /* Get AES encryption strength and actual compression method */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 432 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 433 | err = mz_stream_read_uint8(file_extra_stream, &value8); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 434 | file_info->aes_encryption_mode = value8; |
| 435 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 436 | if (err == MZ_OK) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 437 | err = mz_stream_read_uint16(file_extra_stream, &value16); |
Nathan Moinvaziri | 2ecd8a0 | 2018-07-13 12:31:39 -0700 | [diff] [blame] | 438 | file_info->compression_method = value16; |
| 439 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 440 | } |
| 441 | #endif |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 442 | else if (field_length > 0) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 443 | err = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 444 | } |
| 445 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 446 | field_pos += field_length; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 447 | } |
| 448 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 449 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 450 | /* Get pointers to variable length data */ |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 451 | mz_stream_mem_get_buffer(file_extra_stream, (const void **)&file_info->filename); |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 452 | mz_stream_mem_get_buffer_at(file_extra_stream, extrafield_pos, (const void **)&file_info->extrafield); |
| 453 | mz_stream_mem_get_buffer_at(file_extra_stream, comment_pos, (const void **)&file_info->comment); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 454 | mz_stream_mem_get_buffer_at(file_extra_stream, linkname_pos, (const void **)&file_info->linkname); |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 455 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 456 | /* Set to empty string just in-case */ |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 457 | if (file_info->filename == NULL) |
| 458 | file_info->filename = ""; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 459 | if (file_info->extrafield == NULL) |
| 460 | file_info->extrafield_size = 0; |
Nathan Moinvaziri | 6000844 | 2018-11-07 06:29:01 -0800 | [diff] [blame] | 461 | if (file_info->comment == NULL) |
| 462 | file_info->comment = ""; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 463 | if (file_info->linkname == NULL) |
| 464 | file_info->linkname = ""; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 465 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 466 | if (err == MZ_OK) { |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 467 | mz_zip_print("Zip - Entry - Read header - %s (local %" PRId8 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 468 | file_info->filename, local); |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 469 | mz_zip_print("Zip - Entry - Read header compress (ucs %" PRId64 " cs %" PRId64 " crc 0x%08" PRIx32 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 470 | file_info->uncompressed_size, file_info->compressed_size, file_info->crc); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 471 | if (!local) { |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 472 | mz_zip_print("Zip - Entry - Read header disk (disk %" PRIu32 " offset %" PRId64 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 473 | file_info->disk_number, file_info->disk_offset); |
Nathan Moinvaziri | a93a2ad | 2018-11-13 17:51:42 -0800 | [diff] [blame] | 474 | } |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 475 | mz_zip_print("Zip - Entry - Read header variable (fnl %" PRId32 " efs %" PRId32 " cms %" PRId32 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 476 | file_info->filename_size, file_info->extrafield_size, file_info->comment_size); |
| 477 | } |
| 478 | |
| 479 | return err; |
| 480 | } |
| 481 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 482 | static int32_t mz_zip_entry_read_descriptor(void *stream, uint8_t zip64, uint32_t *crc32, int64_t *compressed_size, int64_t *uncompressed_size) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 483 | uint32_t value32 = 0; |
| 484 | int64_t value64 = 0; |
| 485 | int32_t err = MZ_OK; |
| 486 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 487 | err = mz_stream_read_uint32(stream, &value32); |
| 488 | if (value32 != MZ_ZIP_MAGIC_DATADESCRIPTOR) |
| 489 | err = MZ_FORMAT_ERROR; |
| 490 | if (err == MZ_OK) |
| 491 | err = mz_stream_read_uint32(stream, &value32); |
| 492 | if ((err == MZ_OK) && (crc32 != NULL)) |
| 493 | *crc32 = value32; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 494 | if (err == MZ_OK) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 495 | /* If zip 64 extension is enabled then read as 8 byte */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 496 | if (!zip64) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 497 | err = mz_stream_read_uint32(stream, &value32); |
| 498 | value64 = value32; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 499 | } else { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 500 | err = mz_stream_read_int64(stream, &value64); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 501 | if (value64 < 0) |
| 502 | err = MZ_FORMAT_ERROR; |
| 503 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 504 | if ((err == MZ_OK) && (compressed_size != NULL)) |
| 505 | *compressed_size = value64; |
| 506 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 507 | if (err == MZ_OK) { |
| 508 | if (!zip64) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 509 | err = mz_stream_read_uint32(stream, &value32); |
| 510 | value64 = value32; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 511 | } else { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 512 | err = mz_stream_read_int64(stream, &value64); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 513 | if (value64 < 0) |
| 514 | err = MZ_FORMAT_ERROR; |
| 515 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 516 | if ((err == MZ_OK) && (uncompressed_size != NULL)) |
| 517 | *uncompressed_size = value64; |
| 518 | } |
| 519 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 520 | return err; |
| 521 | } |
| 522 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 523 | static int32_t mz_zip_entry_write_crc_sizes(void *stream, uint8_t zip64, uint8_t mask, mz_zip_file *file_info) { |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 524 | int32_t err = MZ_OK; |
| 525 | |
| 526 | if (mask) |
| 527 | err = mz_stream_write_uint32(stream, 0); |
| 528 | else |
| 529 | err = mz_stream_write_uint32(stream, file_info->crc); /* crc */ |
| 530 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 531 | /* For backwards-compatibility with older zip applications we set all sizes to UINT32_MAX |
| 532 | * when zip64 is needed, instead of only setting sizes larger than UINT32_MAX. */ |
| 533 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 534 | if (err == MZ_OK) { |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 535 | if (zip64) /* compr size */ |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 536 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 537 | else |
| 538 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->compressed_size); |
| 539 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 540 | if (err == MZ_OK) { |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 541 | if (mask) /* uncompr size */ |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 542 | err = mz_stream_write_uint32(stream, 0); |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 543 | else if (zip64) |
| 544 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 545 | else |
| 546 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->uncompressed_size); |
| 547 | } |
| 548 | return err; |
| 549 | } |
| 550 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 551 | static int32_t mz_zip_entry_needs_zip64(mz_zip_file *file_info, uint8_t local, uint8_t *zip64) { |
Vlad Lipskiy | 4b25219 | 2020-12-23 18:35:37 +0300 | [diff] [blame] | 552 | uint32_t max_uncompressed_size = UINT32_MAX; |
Nathan Moinvaziri | d183a40 | 2020-12-23 22:16:36 -0800 | [diff] [blame] | 553 | uint8_t needs_zip64 = 0; |
Vlad Lipskiy | 4b25219 | 2020-12-23 18:35:37 +0300 | [diff] [blame] | 554 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 555 | if (zip64 == NULL) |
| 556 | return MZ_PARAM_ERROR; |
| 557 | |
Nathan Moinvaziri | ca27089 | 2020-12-27 14:54:57 -0800 | [diff] [blame] | 558 | *zip64 = 0; |
| 559 | |
Nathan Moinvaziri | 4cc3ffd | 2020-12-24 09:27:29 -0800 | [diff] [blame] | 560 | if (local) { |
Nathan Moinvaziri | 4cc3ffd | 2020-12-24 09:27:29 -0800 | [diff] [blame] | 561 | /* At local header we might not know yet whether compressed size will overflow unsigned |
| 562 | 32-bit integer which might happen for high entropy data so we give it some cushion */ |
| 563 | |
Nathan Moinvaziri | 161b266 | 2020-12-23 11:50:24 -0800 | [diff] [blame] | 564 | max_uncompressed_size -= MZ_ZIP_UNCOMPR_SIZE64_CUSHION; |
Nathan Moinvaziri | 4cc3ffd | 2020-12-24 09:27:29 -0800 | [diff] [blame] | 565 | } |
Nathan Moinvaziri | 161b266 | 2020-12-23 11:50:24 -0800 | [diff] [blame] | 566 | |
Vlad Lipskiy | 4b25219 | 2020-12-23 18:35:37 +0300 | [diff] [blame] | 567 | needs_zip64 = (file_info->uncompressed_size >= max_uncompressed_size) || |
Nathan Moinvaziri | ca27089 | 2020-12-27 14:54:57 -0800 | [diff] [blame] | 568 | (file_info->compressed_size >= UINT32_MAX); |
| 569 | |
| 570 | if (!local) { |
| 571 | /* Disk offset and number only used in central directory header */ |
| 572 | needs_zip64 |= (file_info->disk_offset >= UINT32_MAX) || |
| 573 | (file_info->disk_number >= UINT16_MAX); |
| 574 | } |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 575 | |
| 576 | if (file_info->zip64 == MZ_ZIP64_AUTO) { |
| 577 | /* If uncompressed size is unknown, assume zip64 for 64-bit data descriptors */ |
Nathan Moinvaziri | ca27089 | 2020-12-27 14:54:57 -0800 | [diff] [blame] | 578 | if (local && file_info->uncompressed_size == 0) { |
| 579 | /* Don't use zip64 for local header directory entries */ |
| 580 | if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) != MZ_OK) { |
| 581 | *zip64 = 1; |
| 582 | } |
| 583 | } |
| 584 | *zip64 |= needs_zip64; |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 585 | } else if (file_info->zip64 == MZ_ZIP64_FORCE) { |
| 586 | *zip64 = 1; |
| 587 | } else if (file_info->zip64 == MZ_ZIP64_DISABLE) { |
| 588 | /* Zip64 extension is required to zip file */ |
| 589 | if (needs_zip64) |
| 590 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 591 | } |
| 592 | |
| 593 | return MZ_OK; |
| 594 | } |
| 595 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 596 | static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_file *file_info) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 597 | uint64_t ntfs_time = 0; |
| 598 | uint32_t reserved = 0; |
| 599 | uint32_t dos_date = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 600 | uint16_t extrafield_size = 0; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 601 | uint16_t field_type = 0; |
| 602 | uint16_t field_length = 0; |
| 603 | uint16_t field_length_zip64 = 0; |
| 604 | uint16_t field_length_ntfs = 0; |
| 605 | uint16_t field_length_aes = 0; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 606 | uint16_t field_length_unix1 = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 607 | uint16_t filename_size = 0; |
Nathan Moinvaziri | 3ad1a92 | 2018-05-02 13:04:41 -0700 | [diff] [blame] | 608 | uint16_t filename_length = 0; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 609 | uint16_t linkname_size = 0; |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 610 | uint16_t version_needed = 0; |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 611 | int32_t comment_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 612 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 613 | int32_t err_mem = MZ_OK; |
| 614 | uint8_t zip64 = 0; |
| 615 | uint8_t skip_aes = 0; |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 616 | uint8_t mask = 0; |
| 617 | uint8_t write_end_slash = 0; |
| 618 | const char *filename = NULL; |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 619 | char masked_name[64]; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 620 | void *file_extra_stream = NULL; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 621 | |
| 622 | if (file_info == NULL) |
| 623 | return MZ_PARAM_ERROR; |
| 624 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 625 | if ((local) && (file_info->flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO)) |
| 626 | mask = 1; |
| 627 | |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 628 | /* Determine if zip64 extra field is necessary */ |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 629 | err = mz_zip_entry_needs_zip64(file_info, local, &zip64); |
| 630 | if (err != MZ_OK) |
| 631 | return err; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 632 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 633 | /* Start calculating extra field sizes */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 634 | if (zip64) { |
Nathan Moinvaziri | 3afaad4 | 2020-12-23 12:02:57 -0800 | [diff] [blame] | 635 | /* Both compressed and uncompressed sizes must be included (at least in local header) */ |
Nathan Moinvaziri | 3d83acd | 2020-12-23 11:14:59 -0800 | [diff] [blame] | 636 | field_length_zip64 = 8 + 8; |
| 637 | if ((!local) && (file_info->disk_offset >= UINT32_MAX)) |
| 638 | field_length_zip64 += 8; |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 639 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 640 | extrafield_size += 4; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 641 | extrafield_size += field_length_zip64; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 642 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 643 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 644 | /* Calculate extra field size and check for duplicates */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 645 | if (file_info->extrafield_size > 0) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 646 | mz_stream_mem_create(&file_extra_stream); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 647 | mz_stream_mem_set_buffer(file_extra_stream, (void *)file_info->extrafield, |
Nathan Moinvaziri | 915c513 | 2018-10-26 20:00:52 -0700 | [diff] [blame] | 648 | file_info->extrafield_size); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 649 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 650 | do { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 651 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_type); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 652 | if (err_mem == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 653 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_length); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 654 | if (err_mem != MZ_OK) |
| 655 | break; |
| 656 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 657 | /* Prefer incoming aes extensions over ours */ |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 658 | if (field_type == MZ_ZIP_EXTENSION_AES) |
| 659 | skip_aes = 1; |
| 660 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 661 | /* Prefer our zip64, ntfs, unix1 extension over incoming */ |
| 662 | if (field_type != MZ_ZIP_EXTENSION_ZIP64 && field_type != MZ_ZIP_EXTENSION_NTFS && |
| 663 | field_type != MZ_ZIP_EXTENSION_UNIX1) |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 664 | extrafield_size += 4 + field_length; |
| 665 | |
| 666 | if (err_mem == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 667 | err_mem = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 668 | } while (err_mem == MZ_OK); |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 669 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 670 | |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 671 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 672 | if (!skip_aes) { |
| 673 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 674 | field_length_aes = 1 + 1 + 1 + 2 + 2; |
| 675 | extrafield_size += 4 + field_length_aes; |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 676 | } |
| 677 | } |
Nathan Moinvaziri | a2bb08c | 2018-10-28 13:45:30 -0700 | [diff] [blame] | 678 | #else |
Nathan Moinvaziri | 7de94cf | 2018-11-19 20:51:06 -0800 | [diff] [blame] | 679 | MZ_UNUSED(field_length_aes); |
Nathan Moinvaziri | 4ae469a | 2018-10-28 15:32:04 -0700 | [diff] [blame] | 680 | MZ_UNUSED(skip_aes); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 681 | #endif |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 682 | /* NTFS timestamps */ |
Nathan Moinvaziri | d9e159a | 2018-02-13 15:30:30 -0800 | [diff] [blame] | 683 | if ((file_info->modified_date != 0) && |
| 684 | (file_info->accessed_date != 0) && |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 685 | (file_info->creation_date != 0) && (!mask)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 686 | field_length_ntfs = 8 + 8 + 8 + 4 + 2 + 2; |
| 687 | extrafield_size += 4 + field_length_ntfs; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 688 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 689 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 690 | /* Unix1 symbolic links */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 691 | if (file_info->linkname != NULL && *file_info->linkname != 0) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 692 | linkname_size = (uint16_t)strlen(file_info->linkname); |
| 693 | field_length_unix1 = 12 + linkname_size; |
| 694 | extrafield_size += 4 + field_length_unix1; |
| 695 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 696 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 697 | if (local) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 698 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_LOCALHEADER); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 699 | else { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 700 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_CENTRALHEADER); |
| 701 | if (err == MZ_OK) |
| 702 | err = mz_stream_write_uint16(stream, file_info->version_madeby); |
| 703 | } |
| 704 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 705 | /* Calculate version needed to extract */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 706 | if (err == MZ_OK) { |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 707 | version_needed = file_info->version_needed; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 708 | if (version_needed == 0) { |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 709 | version_needed = 20; |
| 710 | if (zip64) |
| 711 | version_needed = 45; |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 712 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 713 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
| 714 | version_needed = 51; |
| 715 | #endif |
Nathan Moinvaziri | 1a7e7e4 | 2020-10-25 14:50:53 -0700 | [diff] [blame] | 716 | #if defined(HAVE_LZMA) || defined(HAVE_LIBCOMP) |
Nathan Moinvaziri | c4668ed | 2020-10-25 11:56:19 -0700 | [diff] [blame] | 717 | if ((file_info->compression_method == MZ_COMPRESS_METHOD_LZMA) || |
| 718 | (file_info->compression_method == MZ_COMPRESS_METHOD_XZ)) |
Nathan Moinvaziri | 46f7143 | 2018-05-03 17:24:32 -0700 | [diff] [blame] | 719 | version_needed = 63; |
| 720 | #endif |
| 721 | } |
| 722 | err = mz_stream_write_uint16(stream, version_needed); |
| 723 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 724 | if (err == MZ_OK) |
| 725 | err = mz_stream_write_uint16(stream, file_info->flag); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 726 | if (err == MZ_OK) { |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 727 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | 413822a | 2018-10-20 09:45:07 -0700 | [diff] [blame] | 728 | if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) |
Nathan Moinvaziri | 6e21e86 | 2017-10-19 09:57:54 -0700 | [diff] [blame] | 729 | err = mz_stream_write_uint16(stream, MZ_COMPRESS_METHOD_AES); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 730 | else |
| 731 | #endif |
| 732 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 733 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 734 | if (err == MZ_OK) { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 735 | if (file_info->modified_date != 0 && !mask) |
Nathan Moinvaziri | 17cdaec | 2017-10-26 10:18:41 -0700 | [diff] [blame] | 736 | dos_date = mz_zip_time_t_to_dos_date(file_info->modified_date); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 737 | err = mz_stream_write_uint32(stream, dos_date); |
| 738 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 739 | |
| 740 | if (err == MZ_OK) |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 741 | err = mz_zip_entry_write_crc_sizes(stream, zip64, mask, file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 742 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 743 | if (mask) { |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 744 | snprintf(masked_name, sizeof(masked_name), "%" PRIx32 "_%" PRIx64, |
Nathan Moinvaziri | 264dc18 | 2018-11-13 17:42:13 -0800 | [diff] [blame] | 745 | file_info->disk_number, file_info->disk_offset); |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 746 | filename = masked_name; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 747 | } else { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 748 | filename = file_info->filename; |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 749 | } |
| 750 | |
| 751 | filename_length = (uint16_t)strlen(filename); |
| 752 | filename_size += filename_length; |
| 753 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 754 | if ((mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) && |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 755 | ((filename[filename_length - 1] != '/') && (filename[filename_length - 1] != '\\'))) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 756 | filename_size += 1; |
| 757 | write_end_slash = 1; |
| 758 | } |
| 759 | |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 760 | if (err == MZ_OK) |
| 761 | err = mz_stream_write_uint16(stream, filename_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 762 | if (err == MZ_OK) |
| 763 | err = mz_stream_write_uint16(stream, extrafield_size); |
| 764 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 765 | if (!local) { |
| 766 | if (file_info->comment != NULL) { |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 767 | comment_size = (int32_t)strlen(file_info->comment); |
| 768 | if (comment_size > UINT16_MAX) |
| 769 | comment_size = UINT16_MAX; |
| 770 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 771 | if (err == MZ_OK) |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 772 | err = mz_stream_write_uint16(stream, (uint16_t)comment_size); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 773 | if (err == MZ_OK) |
Nathan Moinvaziri | fd039e3 | 2017-10-22 14:40:39 -0700 | [diff] [blame] | 774 | err = mz_stream_write_uint16(stream, (uint16_t)file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 775 | if (err == MZ_OK) |
| 776 | err = mz_stream_write_uint16(stream, file_info->internal_fa); |
| 777 | if (err == MZ_OK) |
| 778 | err = mz_stream_write_uint32(stream, file_info->external_fa); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 779 | if (err == MZ_OK) { |
Nathan Moinvaziri | 3d83acd | 2020-12-23 11:14:59 -0800 | [diff] [blame] | 780 | if (file_info->disk_offset >= UINT32_MAX) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 781 | err = mz_stream_write_uint32(stream, UINT32_MAX); |
| 782 | else |
| 783 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->disk_offset); |
| 784 | } |
| 785 | } |
| 786 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 787 | if (err == MZ_OK) { |
Nathan Moinvaziri | 6005ae7 | 2022-08-06 10:13:08 -0700 | [diff] [blame] | 788 | const char *backslash = NULL; |
| 789 | const char *next = filename; |
| 790 | int32_t left = filename_length; |
Nathan Moinvaziri | a4b0c78 | 2022-11-29 16:51:20 -0800 | [diff] [blame] | 791 | |
Nathan Moinvaziri | 6005ae7 | 2022-08-06 10:13:08 -0700 | [diff] [blame] | 792 | /* Ensure all slashes are written as forward slashes according to 4.4.17.1 */ |
| 793 | while ((err == MZ_OK) && (backslash = strrchr(next, '\\')) != NULL) { |
| 794 | int32_t part_length = (int32_t)(backslash - next); |
| 795 | |
| 796 | if (mz_stream_write(stream, next, part_length) != part_length || |
Nathan Moinvaziri | a4b0c78 | 2022-11-29 16:51:20 -0800 | [diff] [blame] | 797 | mz_stream_write(stream, "/", 1) != 1) |
Nathan Moinvaziri | 6005ae7 | 2022-08-06 10:13:08 -0700 | [diff] [blame] | 798 | err = MZ_WRITE_ERROR; |
| 799 | |
| 800 | left -= part_length + 1; |
| 801 | next = backslash + 1; |
| 802 | } |
| 803 | |
| 804 | if (err == MZ_OK && left > 0) { |
| 805 | if (mz_stream_write(stream, next, left) != left) |
| 806 | err = MZ_WRITE_ERROR; |
| 807 | } |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 808 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 809 | /* Ensure that directories have a slash appended to them for compatibility */ |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 810 | if (err == MZ_OK && write_end_slash) |
| 811 | err = mz_stream_write_uint8(stream, '/'); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 812 | } |
Nathan Moinvaziri | 298126a | 2018-07-31 10:19:48 -0700 | [diff] [blame] | 813 | |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 814 | /* Write ZIP64 extra field first so we can update sizes later if data descriptor not used */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 815 | if ((err == MZ_OK) && (zip64)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 816 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_ZIP64, field_length_zip64); |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 817 | if (err == MZ_OK) { |
Nathan Moinvaziri | c565fa8 | 2018-10-19 08:48:33 -0700 | [diff] [blame] | 818 | if (mask) |
| 819 | err = mz_stream_write_int64(stream, 0); |
| 820 | else |
| 821 | err = mz_stream_write_int64(stream, file_info->uncompressed_size); |
| 822 | } |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 823 | if (err == MZ_OK) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 824 | err = mz_stream_write_int64(stream, file_info->compressed_size); |
Nathan Moinvaziri | 3d83acd | 2020-12-23 11:14:59 -0800 | [diff] [blame] | 825 | if ((err == MZ_OK) && (!local) && (file_info->disk_offset >= UINT32_MAX)) |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 826 | err = mz_stream_write_int64(stream, file_info->disk_offset); |
Nathan Moinvaziri | b2a148c | 2020-12-23 23:55:55 -0800 | [diff] [blame] | 827 | if ((err == MZ_OK) && (!local) && (file_info->disk_number >= UINT16_MAX)) |
| 828 | err = mz_stream_write_uint32(stream, file_info->disk_number); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 829 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 830 | /* Write NTFS extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 831 | if ((err == MZ_OK) && (field_length_ntfs > 0)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 832 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_NTFS, field_length_ntfs); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 833 | if (err == MZ_OK) |
| 834 | err = mz_stream_write_uint32(stream, reserved); |
| 835 | if (err == MZ_OK) |
| 836 | err = mz_stream_write_uint16(stream, 0x01); |
| 837 | if (err == MZ_OK) |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 838 | err = mz_stream_write_uint16(stream, field_length_ntfs - 8); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 839 | if (err == MZ_OK) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 840 | mz_zip_unix_to_ntfs_time(file_info->modified_date, &ntfs_time); |
| 841 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 842 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 843 | if (err == MZ_OK) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 844 | mz_zip_unix_to_ntfs_time(file_info->accessed_date, &ntfs_time); |
| 845 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 846 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 847 | if (err == MZ_OK) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 848 | mz_zip_unix_to_ntfs_time(file_info->creation_date, &ntfs_time); |
| 849 | err = mz_stream_write_uint64(stream, ntfs_time); |
| 850 | } |
| 851 | } |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 852 | /* Write UNIX extra block extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 853 | if ((err == MZ_OK) && (field_length_unix1 > 0)) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 854 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_UNIX1, field_length_unix1); |
| 855 | if (err == MZ_OK) |
Nathan Moinvaziri | aeb6cdd | 2019-05-06 13:40:32 -0700 | [diff] [blame] | 856 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->accessed_date); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 857 | if (err == MZ_OK) |
Nathan Moinvaziri | aeb6cdd | 2019-05-06 13:40:32 -0700 | [diff] [blame] | 858 | err = mz_stream_write_uint32(stream, (uint32_t)file_info->modified_date); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 859 | if (err == MZ_OK) /* User id */ |
| 860 | err = mz_stream_write_uint16(stream, 0); |
| 861 | if (err == MZ_OK) /* Group id */ |
| 862 | err = mz_stream_write_uint16(stream, 0); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 863 | if (err == MZ_OK && linkname_size > 0) { |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 864 | if (mz_stream_write(stream, file_info->linkname, linkname_size) != linkname_size) |
| 865 | err = MZ_WRITE_ERROR; |
| 866 | } |
| 867 | } |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 868 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 869 | /* Write AES extra field */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 870 | if ((err == MZ_OK) && (!skip_aes) && (file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version)) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 871 | err = mz_zip_extrafield_write(stream, MZ_ZIP_EXTENSION_AES, field_length_aes); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 872 | if (err == MZ_OK) |
| 873 | err = mz_stream_write_uint16(stream, file_info->aes_version); |
| 874 | if (err == MZ_OK) |
| 875 | err = mz_stream_write_uint8(stream, 'A'); |
| 876 | if (err == MZ_OK) |
| 877 | err = mz_stream_write_uint8(stream, 'E'); |
| 878 | if (err == MZ_OK) |
| 879 | err = mz_stream_write_uint8(stream, file_info->aes_encryption_mode); |
| 880 | if (err == MZ_OK) |
| 881 | err = mz_stream_write_uint16(stream, file_info->compression_method); |
| 882 | } |
| 883 | #endif |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 884 | |
| 885 | if (file_info->extrafield_size > 0) { |
| 886 | err_mem = mz_stream_mem_seek(file_extra_stream, 0, MZ_SEEK_SET); |
| 887 | while (err == MZ_OK && err_mem == MZ_OK) { |
| 888 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_type); |
| 889 | if (err_mem == MZ_OK) |
| 890 | err_mem = mz_stream_read_uint16(file_extra_stream, &field_length); |
| 891 | if (err_mem != MZ_OK) |
| 892 | break; |
| 893 | |
| 894 | /* Prefer our zip 64, ntfs, unix1 extensions over incoming */ |
| 895 | if (field_type == MZ_ZIP_EXTENSION_ZIP64 || field_type == MZ_ZIP_EXTENSION_NTFS || |
| 896 | field_type == MZ_ZIP_EXTENSION_UNIX1) { |
| 897 | err_mem = mz_stream_seek(file_extra_stream, field_length, MZ_SEEK_CUR); |
| 898 | continue; |
| 899 | } |
| 900 | |
| 901 | err = mz_stream_write_uint16(stream, field_type); |
| 902 | if (err == MZ_OK) |
| 903 | err = mz_stream_write_uint16(stream, field_length); |
| 904 | if (err == MZ_OK) |
| 905 | err = mz_stream_copy(stream, file_extra_stream, field_length); |
| 906 | } |
| 907 | |
| 908 | mz_stream_mem_delete(&file_extra_stream); |
| 909 | } |
| 910 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 911 | if ((err == MZ_OK) && (!local) && (file_info->comment != NULL)) { |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 912 | if (mz_stream_write(stream, file_info->comment, file_info->comment_size) != file_info->comment_size) |
Nathan Moinvaziri | 05e03ca | 2018-10-28 16:15:13 -0700 | [diff] [blame] | 913 | err = MZ_WRITE_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 914 | } |
| 915 | |
| 916 | return err; |
| 917 | } |
| 918 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 919 | static int32_t mz_zip_entry_write_descriptor(void *stream, uint8_t zip64, uint32_t crc32, int64_t compressed_size, int64_t uncompressed_size) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 920 | int32_t err = MZ_OK; |
| 921 | |
| 922 | err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_DATADESCRIPTOR); |
| 923 | if (err == MZ_OK) |
| 924 | err = mz_stream_write_uint32(stream, crc32); |
| 925 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 926 | /* Store data descriptor as 8 bytes if zip 64 extension enabled */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 927 | if (err == MZ_OK) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 928 | /* Zip 64 extension is enabled when uncompressed size is > UINT32_MAX */ |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 929 | if (!zip64) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 930 | err = mz_stream_write_uint32(stream, (uint32_t)compressed_size); |
| 931 | else |
| 932 | err = mz_stream_write_int64(stream, compressed_size); |
| 933 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 934 | if (err == MZ_OK) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 935 | if (!zip64) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 936 | err = mz_stream_write_uint32(stream, (uint32_t)uncompressed_size); |
| 937 | else |
| 938 | err = mz_stream_write_int64(stream, uncompressed_size); |
| 939 | } |
| 940 | |
| 941 | return err; |
| 942 | } |
| 943 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 944 | static int32_t mz_zip_read_cd(void *handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 945 | mz_zip *zip = (mz_zip *)handle; |
| 946 | uint64_t number_entry_cd64 = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 947 | uint64_t number_entry_cd = 0; |
| 948 | int64_t eocd_pos = 0; |
| 949 | int64_t eocd_pos64 = 0; |
| 950 | int64_t value64i = 0; |
| 951 | uint16_t value16 = 0; |
| 952 | uint32_t value32 = 0; |
| 953 | uint64_t value64 = 0; |
| 954 | uint16_t comment_size = 0; |
| 955 | int32_t comment_read = 0; |
| 956 | int32_t err = MZ_OK; |
| 957 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 958 | if (zip == NULL) |
| 959 | return MZ_PARAM_ERROR; |
| 960 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 961 | /* Read and cache central directory records */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 962 | err = mz_zip_search_eocd(zip->stream, &eocd_pos); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 963 | if (err == MZ_OK) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 964 | /* The signature, already checked */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 965 | err = mz_stream_read_uint32(zip->stream, &value32); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 966 | /* Number of this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 967 | if (err == MZ_OK) |
| 968 | err = mz_stream_read_uint16(zip->stream, &value16); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 969 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 970 | if (err == MZ_OK) |
| 971 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 972 | zip->disk_number_with_cd = value16; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 973 | /* Total number of entries in the central dir on this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 974 | if (err == MZ_OK) |
| 975 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 976 | zip->number_entry = value16; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 977 | /* Total number of entries in the central dir */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 978 | if (err == MZ_OK) |
| 979 | err = mz_stream_read_uint16(zip->stream, &value16); |
| 980 | number_entry_cd = value16; |
| 981 | if (number_entry_cd != zip->number_entry) |
| 982 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 983 | /* Size of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 984 | if (err == MZ_OK) |
| 985 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 986 | if (err == MZ_OK) |
| 987 | zip->cd_size = value32; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 988 | /* Offset of start of central directory with respect to the starting disk number */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 989 | if (err == MZ_OK) |
| 990 | err = mz_stream_read_uint32(zip->stream, &value32); |
| 991 | if (err == MZ_OK) |
| 992 | zip->cd_offset = value32; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 993 | /* Zip file global comment length */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 994 | if (err == MZ_OK) |
| 995 | err = mz_stream_read_uint16(zip->stream, &comment_size); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 996 | if ((err == MZ_OK) && (comment_size > 0)) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 997 | zip->comment = (char *)MZ_ALLOC(comment_size + 1); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 998 | if (zip->comment != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 999 | comment_read = mz_stream_read(zip->stream, zip->comment, comment_size); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1000 | /* Don't fail if incorrect comment length read, not critical */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1001 | if (comment_read < 0) |
| 1002 | comment_read = 0; |
| 1003 | zip->comment[comment_read] = 0; |
| 1004 | } |
| 1005 | } |
| 1006 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1007 | if ((err == MZ_OK) && ((number_entry_cd == UINT16_MAX) || (zip->cd_offset == UINT32_MAX))) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1008 | /* Format should be Zip64, as the central directory or file size is too large */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1009 | if (mz_zip_search_zip64_eocd(zip->stream, eocd_pos, &eocd_pos64) == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1010 | eocd_pos = eocd_pos64; |
| 1011 | |
| 1012 | err = mz_stream_seek(zip->stream, eocd_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1013 | /* The signature, already checked */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1014 | if (err == MZ_OK) |
| 1015 | err = mz_stream_read_uint32(zip->stream, &value32); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1016 | /* Size of zip64 end of central directory record */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1017 | if (err == MZ_OK) |
| 1018 | err = mz_stream_read_uint64(zip->stream, &value64); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1019 | /* Version made by */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1020 | if (err == MZ_OK) |
| 1021 | err = mz_stream_read_uint16(zip->stream, &zip->version_madeby); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1022 | /* Version needed to extract */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1023 | if (err == MZ_OK) |
| 1024 | err = mz_stream_read_uint16(zip->stream, &value16); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1025 | /* Number of this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1026 | if (err == MZ_OK) |
| 1027 | err = mz_stream_read_uint32(zip->stream, &value32); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1028 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1029 | if (err == MZ_OK) |
| 1030 | err = mz_stream_read_uint32(zip->stream, &zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1031 | /* Total number of entries in the central directory on this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1032 | if (err == MZ_OK) |
Gabriel Dubois | 3b3961e | 2020-03-20 15:48:40 +0000 | [diff] [blame] | 1033 | err = mz_stream_read_uint64(zip->stream, &zip->number_entry); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1034 | /* Total number of entries in the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1035 | if (err == MZ_OK) |
| 1036 | err = mz_stream_read_uint64(zip->stream, &number_entry_cd64); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1037 | if (zip->number_entry != number_entry_cd64) |
Gabriel Dubois | 3b3961e | 2020-03-20 15:48:40 +0000 | [diff] [blame] | 1038 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1039 | /* Size of the central directory */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1040 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1041 | err = mz_stream_read_int64(zip->stream, &zip->cd_size); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 1042 | if (zip->cd_size < 0) |
| 1043 | err = MZ_FORMAT_ERROR; |
| 1044 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1045 | /* Offset of start of central directory with respect to the starting disk number */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1046 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1047 | err = mz_stream_read_int64(zip->stream, &zip->cd_offset); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 1048 | if (zip->cd_offset < 0) |
| 1049 | err = MZ_FORMAT_ERROR; |
| 1050 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1051 | } else if ((zip->number_entry == UINT16_MAX) || (number_entry_cd != zip->number_entry) || |
| 1052 | (zip->cd_size == UINT16_MAX) || (zip->cd_offset == UINT32_MAX)) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1053 | err = MZ_FORMAT_ERROR; |
| 1054 | } |
| 1055 | } |
| 1056 | } |
| 1057 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1058 | if (err == MZ_OK) { |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 1059 | mz_zip_print("Zip - Read cd (disk %" PRId32 " entries %" PRId64 " offset %" PRId64 " size %" PRId64 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1060 | zip->disk_number_with_cd, zip->number_entry, zip->cd_offset, zip->cd_size); |
| 1061 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1062 | /* Verify central directory signature exists at offset */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1063 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 1064 | if (err == MZ_OK) |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 1065 | err = mz_stream_read_uint32(zip->stream, &zip->cd_signature); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1066 | if ((err == MZ_OK) && (zip->cd_signature != MZ_ZIP_MAGIC_CENTRALHEADER)) { |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1067 | /* If cd exists in large file and no zip-64 support, error for recover */ |
| 1068 | if (eocd_pos > UINT32_MAX && eocd_pos64 == 0) |
| 1069 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 1070 | /* If cd not found attempt to seek backward to find it */ |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1071 | if (err == MZ_OK) |
| 1072 | err = mz_stream_seek(zip->stream, eocd_pos - zip->cd_size, MZ_SEEK_SET); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1073 | if (err == MZ_OK) |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 1074 | err = mz_stream_read_uint32(zip->stream, &zip->cd_signature); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1075 | if ((err == MZ_OK) && (zip->cd_signature == MZ_ZIP_MAGIC_CENTRALHEADER)) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1076 | /* If found compensate for incorrect locations */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1077 | value64i = zip->cd_offset; |
| 1078 | zip->cd_offset = eocd_pos - zip->cd_size; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1079 | /* Assume disk has prepended data */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1080 | zip->disk_offset_shift = zip->cd_offset - value64i; |
| 1081 | } |
| 1082 | } |
| 1083 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1084 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1085 | if (err == MZ_OK) { |
| 1086 | if (eocd_pos < zip->cd_offset) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1087 | /* End of central dir should always come after central dir */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1088 | err = MZ_FORMAT_ERROR; |
Nathan Moinvaziri | e23732e | 2021-01-29 18:36:28 -0800 | [diff] [blame] | 1089 | } else if ((uint64_t)eocd_pos < (uint64_t)zip->cd_offset + zip->cd_size) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1090 | /* Truncate size of cd if incorrect size or offset provided */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1091 | zip->cd_size = eocd_pos - zip->cd_offset; |
| 1092 | } |
| 1093 | } |
| 1094 | |
| 1095 | return err; |
| 1096 | } |
| 1097 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1098 | static int32_t mz_zip_write_cd(void *handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1099 | mz_zip *zip = (mz_zip *)handle; |
| 1100 | int64_t zip64_eocd_pos_inzip = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1101 | int64_t disk_number = 0; |
| 1102 | int64_t disk_size = 0; |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1103 | int32_t comment_size = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1104 | int32_t err = MZ_OK; |
| 1105 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1106 | if (zip == NULL) |
| 1107 | return MZ_PARAM_ERROR; |
| 1108 | |
| 1109 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number) == MZ_OK) |
| 1110 | zip->disk_number_with_cd = (uint32_t)disk_number; |
| 1111 | if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size) == MZ_OK && disk_size > 0) |
| 1112 | zip->disk_number_with_cd += 1; |
| 1113 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1114 | if ((zip->disk_number_with_cd > 0) && (zip->open_mode & MZ_OPEN_MODE_APPEND)) { |
Nathan Moinvaziri | f286b83 | 2019-11-10 17:09:48 -0800 | [diff] [blame] | 1115 | // Overwrite existing central directory if using split disks |
| 1116 | mz_stream_seek(zip->stream, 0, MZ_SEEK_SET); |
| 1117 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1118 | |
| 1119 | zip->cd_offset = mz_stream_tell(zip->stream); |
| 1120 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_END); |
| 1121 | zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_mem_stream); |
| 1122 | mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_SET); |
| 1123 | |
| 1124 | err = mz_stream_copy(zip->stream, zip->cd_mem_stream, (int32_t)zip->cd_size); |
| 1125 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 1126 | mz_zip_print("Zip - Write cd (disk %" PRId32 " entries %" PRId64 " offset %" PRId64 " size %" PRId64 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1127 | zip->disk_number_with_cd, zip->number_entry, zip->cd_offset, zip->cd_size); |
| 1128 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1129 | if (zip->cd_size == 0 && zip->number_entry > 0) { |
Nathan Moinvaziri | 64faa25 | 2019-04-21 21:38:48 -0700 | [diff] [blame] | 1130 | // Zip does not contain central directory, open with recovery option |
| 1131 | return MZ_FORMAT_ERROR; |
| 1132 | } |
| 1133 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1134 | /* Write the ZIP64 central directory header */ |
Nathan Moinvaziri | 2631b7b | 2021-11-12 17:53:23 -0800 | [diff] [blame] | 1135 | if (zip->cd_offset >= UINT32_MAX || zip->number_entry >= UINT16_MAX) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1136 | zip64_eocd_pos_inzip = mz_stream_tell(zip->stream); |
| 1137 | |
| 1138 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER64); |
| 1139 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1140 | /* Size of this 'zip64 end of central directory' */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1141 | if (err == MZ_OK) |
| 1142 | err = mz_stream_write_uint64(zip->stream, (uint64_t)44); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1143 | /* Version made by */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1144 | if (err == MZ_OK) |
| 1145 | err = mz_stream_write_uint16(zip->stream, zip->version_madeby); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1146 | /* Version needed */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1147 | if (err == MZ_OK) |
| 1148 | err = mz_stream_write_uint16(zip->stream, (uint16_t)45); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1149 | /* Number of this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1150 | if (err == MZ_OK) |
| 1151 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1152 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1153 | if (err == MZ_OK) |
| 1154 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1155 | /* Total number of entries in the central dir on this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1156 | if (err == MZ_OK) |
| 1157 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1158 | /* Total number of entries in the central dir */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1159 | if (err == MZ_OK) |
| 1160 | err = mz_stream_write_uint64(zip->stream, zip->number_entry); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1161 | /* Size of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1162 | if (err == MZ_OK) |
| 1163 | err = mz_stream_write_int64(zip->stream, zip->cd_size); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1164 | /* Offset of start of central directory with respect to the starting disk number */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1165 | if (err == MZ_OK) |
| 1166 | err = mz_stream_write_int64(zip->stream, zip->cd_offset); |
| 1167 | if (err == MZ_OK) |
| 1168 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDLOCHEADER64); |
| 1169 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1170 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1171 | if (err == MZ_OK) |
| 1172 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1173 | /* Relative offset to the end of zip64 central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1174 | if (err == MZ_OK) |
| 1175 | err = mz_stream_write_int64(zip->stream, zip64_eocd_pos_inzip); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1176 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1177 | if (err == MZ_OK) |
| 1178 | err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd + 1); |
| 1179 | } |
| 1180 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1181 | /* Write the central directory header */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1182 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1183 | /* Signature */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1184 | if (err == MZ_OK) |
| 1185 | err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1186 | /* Number of this disk */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1187 | if (err == MZ_OK) |
| 1188 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1189 | /* Number of the disk with the start of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1190 | if (err == MZ_OK) |
| 1191 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->disk_number_with_cd); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1192 | /* Total number of entries in the central dir on this disk */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1193 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1194 | if (zip->number_entry >= UINT16_MAX) |
| 1195 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 1196 | else |
| 1197 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
| 1198 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1199 | /* Total number of entries in the central dir */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1200 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1201 | if (zip->number_entry >= UINT16_MAX) |
| 1202 | err = mz_stream_write_uint16(zip->stream, UINT16_MAX); |
| 1203 | else |
| 1204 | err = mz_stream_write_uint16(zip->stream, (uint16_t)zip->number_entry); |
| 1205 | } |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1206 | /* Size of the central directory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1207 | if (err == MZ_OK) |
| 1208 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_size); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1209 | /* Offset of start of central directory with respect to the starting disk number */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1210 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1211 | if (zip->cd_offset >= UINT32_MAX) |
| 1212 | err = mz_stream_write_uint32(zip->stream, UINT32_MAX); |
| 1213 | else |
| 1214 | err = mz_stream_write_uint32(zip->stream, (uint32_t)zip->cd_offset); |
| 1215 | } |
| 1216 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1217 | /* Write global comment */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1218 | if (zip->comment != NULL) { |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1219 | comment_size = (int32_t)strlen(zip->comment); |
| 1220 | if (comment_size > UINT16_MAX) |
| 1221 | comment_size = UINT16_MAX; |
| 1222 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1223 | if (err == MZ_OK) |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1224 | err = mz_stream_write_uint16(zip->stream, (uint16_t)comment_size); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1225 | if (err == MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1226 | if (mz_stream_write(zip->stream, zip->comment, comment_size) != comment_size) |
| 1227 | err = MZ_READ_ERROR; |
| 1228 | } |
| 1229 | return err; |
| 1230 | } |
| 1231 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1232 | static int32_t mz_zip_recover_cd(void *handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1233 | mz_zip *zip = (mz_zip *)handle; |
| 1234 | mz_zip_file local_file_info; |
| 1235 | void *local_file_info_stream = NULL; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1236 | void *cd_mem_stream = NULL; |
| 1237 | uint64_t number_entry = 0; |
| 1238 | int64_t descriptor_pos = 0; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1239 | int64_t next_header_pos = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1240 | int64_t disk_offset = 0; |
| 1241 | int64_t disk_number = 0; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1242 | int64_t compressed_pos = 0; |
| 1243 | int64_t compressed_end_pos = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1244 | int64_t compressed_size = 0; |
| 1245 | int64_t uncompressed_size = 0; |
| 1246 | uint8_t descriptor_magic[4] = MZ_ZIP_MAGIC_DATADESCRIPTORU8; |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1247 | uint8_t local_header_magic[4] = MZ_ZIP_MAGIC_LOCALHEADERU8; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1248 | uint8_t central_header_magic[4] = MZ_ZIP_MAGIC_CENTRALHEADERU8; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1249 | uint32_t crc32 = 0; |
| 1250 | int32_t disk_number_with_cd = 0; |
| 1251 | int32_t err = MZ_OK; |
| 1252 | uint8_t zip64 = 0; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1253 | uint8_t eof = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1254 | |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1255 | mz_zip_print("Zip - Recover - Start\n"); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1256 | |
| 1257 | mz_zip_get_cd_mem_stream(handle, &cd_mem_stream); |
| 1258 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1259 | /* Determine if we are on a split disk or not */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1260 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, 0); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1261 | if (mz_stream_tell(zip->stream) < 0) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1262 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
| 1263 | mz_stream_seek(zip->stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1264 | } else |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1265 | disk_number_with_cd = 1; |
| 1266 | |
| 1267 | if (mz_stream_is_open(cd_mem_stream) != MZ_OK) |
| 1268 | err = mz_stream_mem_open(cd_mem_stream, NULL, MZ_OPEN_MODE_CREATE); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1269 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1270 | mz_stream_mem_create(&local_file_info_stream); |
| 1271 | mz_stream_mem_open(local_file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
Nathan Moinvaziri | 57cbcd2 | 2019-10-21 15:37:58 -0700 | [diff] [blame] | 1272 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1273 | if (err == MZ_OK) { |
Nathan Moinvaziri | 57cbcd2 | 2019-10-21 15:37:58 -0700 | [diff] [blame] | 1274 | err = mz_stream_find(zip->stream, (const void *)local_header_magic, sizeof(local_header_magic), |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1275 | INT64_MAX, &next_header_pos); |
Nathan Moinvaziri | 57cbcd2 | 2019-10-21 15:37:58 -0700 | [diff] [blame] | 1276 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1277 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1278 | while (err == MZ_OK && !eof) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1279 | /* Get current offset and disk number for central dir record */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1280 | disk_offset = mz_stream_tell(zip->stream); |
| 1281 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number); |
| 1282 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1283 | /* Read local headers */ |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1284 | memset(&local_file_info, 0, sizeof(local_file_info)); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1285 | err = mz_zip_entry_read_header(zip->stream, 1, &local_file_info, local_file_info_stream); |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1286 | if (err != MZ_OK) |
| 1287 | break; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1288 | |
| 1289 | local_file_info.disk_offset = disk_offset; |
| 1290 | if (disk_number < 0) |
| 1291 | disk_number = 0; |
| 1292 | local_file_info.disk_number = (uint32_t)disk_number; |
Nathan Moinvaziri | 370ab03 | 2019-11-15 13:24:17 -0800 | [diff] [blame] | 1293 | |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1294 | compressed_pos = mz_stream_tell(zip->stream); |
Nathan Moinvaziri | 370ab03 | 2019-11-15 13:24:17 -0800 | [diff] [blame] | 1295 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1296 | if ((err == MZ_OK) && (local_file_info.compressed_size > 0)) { |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1297 | mz_stream_seek(zip->stream, local_file_info.compressed_size, MZ_SEEK_CUR); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1298 | } |
| 1299 | |
Nathan Moinvaziri | 958226c | 2020-07-30 11:06:25 -0700 | [diff] [blame] | 1300 | for (;;) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1301 | /* Search for the next local header */ |
| 1302 | err = mz_stream_find(zip->stream, (const void *)local_header_magic, sizeof(local_header_magic), |
| 1303 | INT64_MAX, &next_header_pos); |
Nathan Moinvaziri | 370ab03 | 2019-11-15 13:24:17 -0800 | [diff] [blame] | 1304 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1305 | if (err == MZ_EXIST_ERROR) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1306 | mz_stream_seek(zip->stream, compressed_pos, MZ_SEEK_SET); |
| 1307 | |
| 1308 | /* Search for central dir if no local header found */ |
| 1309 | err = mz_stream_find(zip->stream, (const void *)central_header_magic, sizeof(central_header_magic), |
| 1310 | INT64_MAX, &next_header_pos); |
| 1311 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1312 | if (err == MZ_EXIST_ERROR) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1313 | /* Get end of stream if no central header found */ |
| 1314 | mz_stream_seek(zip->stream, 0, MZ_SEEK_END); |
| 1315 | next_header_pos = mz_stream_tell(zip->stream); |
| 1316 | } |
| 1317 | |
| 1318 | eof = 1; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1319 | } |
| 1320 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1321 | if (local_file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR || local_file_info.compressed_size == 0) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1322 | /* Search backwards for the descriptor, seeking too far back will be incorrect if compressed size is small */ |
| 1323 | err = mz_stream_find_reverse(zip->stream, (const void *)descriptor_magic, sizeof(descriptor_magic), |
| 1324 | MZ_ZIP_SIZE_MAX_DATA_DESCRIPTOR, &descriptor_pos); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1325 | if (err == MZ_OK) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1326 | if (mz_zip_extrafield_contains(local_file_info.extrafield, |
| 1327 | local_file_info.extrafield_size, MZ_ZIP_EXTENSION_ZIP64, NULL) == MZ_OK) |
| 1328 | zip64 = 1; |
| 1329 | |
| 1330 | err = mz_zip_entry_read_descriptor(zip->stream, zip64, &crc32, |
| 1331 | &compressed_size, &uncompressed_size); |
| 1332 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1333 | if (err == MZ_OK) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1334 | if (local_file_info.crc == 0) |
| 1335 | local_file_info.crc = crc32; |
| 1336 | if (local_file_info.compressed_size == 0) |
| 1337 | local_file_info.compressed_size = compressed_size; |
| 1338 | if (local_file_info.uncompressed_size == 0) |
| 1339 | local_file_info.uncompressed_size = uncompressed_size; |
| 1340 | } |
| 1341 | |
| 1342 | compressed_end_pos = descriptor_pos; |
Nathan Moinvaziri | 958226c | 2020-07-30 11:06:25 -0700 | [diff] [blame] | 1343 | } else if (eof) { |
| 1344 | compressed_end_pos = next_header_pos; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1345 | } else if (local_file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1346 | /* Wrong local file entry found, keep searching */ |
| 1347 | next_header_pos += 1; |
| 1348 | mz_stream_seek(zip->stream, next_header_pos, MZ_SEEK_SET); |
| 1349 | continue; |
| 1350 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1351 | } else { |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1352 | compressed_end_pos = next_header_pos; |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1353 | } |
| 1354 | |
Nathan Moinvaziri | 4b5bd87 | 2019-11-11 17:04:05 -0800 | [diff] [blame] | 1355 | break; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1356 | } |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1357 | |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1358 | compressed_size = compressed_end_pos - compressed_pos; |
| 1359 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1360 | if (compressed_size > UINT32_MAX) { |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1361 | /* Update sizes if 4GB file is written with no ZIP64 support */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1362 | if (local_file_info.uncompressed_size < UINT32_MAX) { |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1363 | local_file_info.compressed_size = compressed_size; |
| 1364 | local_file_info.uncompressed_size = 0; |
| 1365 | } |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1366 | } |
| 1367 | |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1368 | mz_zip_print("Zip - Recover - Entry %s (csize %" PRId64 " usize %" PRId64 " flags 0x%" PRIx16 ")\n", |
| 1369 | local_file_info.filename, local_file_info.compressed_size, local_file_info.uncompressed_size, |
| 1370 | local_file_info.flag); |
| 1371 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1372 | /* Rewrite central dir with local headers and offsets */ |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1373 | err = mz_zip_entry_write_header(cd_mem_stream, 0, &local_file_info); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1374 | if (err == MZ_OK) |
Nathan Moinvaziri | 370ab03 | 2019-11-15 13:24:17 -0800 | [diff] [blame] | 1375 | number_entry += 1; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1376 | |
Nathan Moinvaziri | 545d729 | 2019-10-21 15:32:18 -0700 | [diff] [blame] | 1377 | err = mz_stream_seek(zip->stream, next_header_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1378 | } |
| 1379 | |
| 1380 | mz_stream_mem_delete(&local_file_info_stream); |
| 1381 | |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1382 | mz_zip_print("Zip - Recover - Complete (cddisk %" PRId32 " entries %" PRId64 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1383 | disk_number_with_cd, number_entry); |
| 1384 | |
| 1385 | if (number_entry == 0) |
| 1386 | return err; |
Nathan Moinvaziri | 370ab03 | 2019-11-15 13:24:17 -0800 | [diff] [blame] | 1387 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1388 | /* Set new upper seek boundary for central dir mem stream */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1389 | disk_offset = mz_stream_tell(cd_mem_stream); |
| 1390 | mz_stream_mem_set_buffer_limit(cd_mem_stream, (int32_t)disk_offset); |
| 1391 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1392 | /* Set new central directory info */ |
Nathan Moinvaziri | 4d08973 | 2018-11-19 20:24:26 -0800 | [diff] [blame] | 1393 | mz_zip_set_cd_stream(handle, 0, cd_mem_stream); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1394 | mz_zip_set_number_entry(handle, number_entry); |
| 1395 | mz_zip_set_disk_number_with_cd(handle, disk_number_with_cd); |
| 1396 | |
| 1397 | return MZ_OK; |
| 1398 | } |
| 1399 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1400 | void *mz_zip_create(void **handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1401 | mz_zip *zip = NULL; |
| 1402 | |
| 1403 | zip = (mz_zip *)MZ_ALLOC(sizeof(mz_zip)); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1404 | if (zip != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1405 | memset(zip, 0, sizeof(mz_zip)); |
Nathan Moinvaziri | 41fcda9 | 2020-01-04 16:55:21 -0800 | [diff] [blame] | 1406 | zip->data_descriptor = 1; |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 1407 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1408 | if (handle != NULL) |
| 1409 | *handle = zip; |
| 1410 | |
| 1411 | return zip; |
| 1412 | } |
| 1413 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1414 | void mz_zip_delete(void **handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1415 | mz_zip *zip = NULL; |
| 1416 | if (handle == NULL) |
| 1417 | return; |
| 1418 | zip = (mz_zip *)*handle; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1419 | if (zip != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1420 | MZ_FREE(zip); |
| 1421 | } |
| 1422 | *handle = NULL; |
| 1423 | } |
| 1424 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1425 | int32_t mz_zip_open(void *handle, void *stream, int32_t mode) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1426 | mz_zip *zip = (mz_zip *)handle; |
| 1427 | int32_t err = MZ_OK; |
| 1428 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1429 | if (zip == NULL) |
| 1430 | return MZ_PARAM_ERROR; |
| 1431 | |
| 1432 | mz_zip_print("Zip - Open\n"); |
| 1433 | |
| 1434 | zip->stream = stream; |
| 1435 | |
| 1436 | mz_stream_mem_create(&zip->cd_mem_stream); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1437 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1438 | if (mode & MZ_OPEN_MODE_WRITE) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1439 | mz_stream_mem_open(zip->cd_mem_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1440 | zip->cd_stream = zip->cd_mem_stream; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1441 | } else { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1442 | zip->cd_stream = stream; |
| 1443 | } |
| 1444 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1445 | if ((mode & MZ_OPEN_MODE_READ) || (mode & MZ_OPEN_MODE_APPEND)) { |
| 1446 | if ((mode & MZ_OPEN_MODE_CREATE) == 0) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1447 | err = mz_zip_read_cd(zip); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1448 | if (err != MZ_OK) { |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1449 | mz_zip_print("Zip - Error detected reading cd (%" PRId32 ")\n", err); |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1450 | if (zip->recover && mz_zip_recover_cd(zip) == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1451 | err = MZ_OK; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1452 | } |
| 1453 | } |
| 1454 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1455 | if ((err == MZ_OK) && (mode & MZ_OPEN_MODE_APPEND)) { |
| 1456 | if (zip->cd_size > 0) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1457 | /* Store central directory in memory */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1458 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
| 1459 | if (err == MZ_OK) |
| 1460 | err = mz_stream_copy(zip->cd_mem_stream, zip->stream, (int32_t)zip->cd_size); |
| 1461 | if (err == MZ_OK) |
| 1462 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1463 | } else { |
| 1464 | if (zip->cd_signature == MZ_ZIP_MAGIC_ENDHEADER) { |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 1465 | /* If tiny zip then overwrite end header */ |
| 1466 | err = mz_stream_seek(zip->stream, zip->cd_offset, MZ_SEEK_SET); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1467 | } else { |
Nathan Moinvaziri | 0e1fd89 | 2019-09-28 20:55:37 -0700 | [diff] [blame] | 1468 | /* If no central directory, append new zip to end of file */ |
| 1469 | err = mz_stream_seek(zip->stream, 0, MZ_SEEK_END); |
| 1470 | } |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1471 | } |
Nathan Moinvaziri | 2ce1fe2 | 2018-11-23 11:53:11 -0800 | [diff] [blame] | 1472 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1473 | if (zip->disk_number_with_cd > 0) { |
Nathan Moinvaziri | 2ce1fe2 | 2018-11-23 11:53:11 -0800 | [diff] [blame] | 1474 | /* Move to last disk to begin appending */ |
| 1475 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, zip->disk_number_with_cd - 1); |
| 1476 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1477 | } else { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1478 | zip->cd_start_pos = zip->cd_offset; |
| 1479 | } |
| 1480 | } |
| 1481 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1482 | if (err != MZ_OK) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1483 | mz_zip_close(zip); |
| 1484 | return err; |
| 1485 | } |
| 1486 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1487 | /* Memory streams used to store variable length file info data */ |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1488 | mz_stream_mem_create(&zip->file_info_stream); |
| 1489 | mz_stream_mem_open(zip->file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1490 | |
| 1491 | mz_stream_mem_create(&zip->local_file_info_stream); |
| 1492 | mz_stream_mem_open(zip->local_file_info_stream, NULL, MZ_OPEN_MODE_CREATE); |
| 1493 | |
| 1494 | zip->open_mode = mode; |
| 1495 | |
| 1496 | return err; |
| 1497 | } |
| 1498 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1499 | int32_t mz_zip_close(void *handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1500 | mz_zip *zip = (mz_zip *)handle; |
| 1501 | int32_t err = MZ_OK; |
| 1502 | |
| 1503 | if (zip == NULL) |
| 1504 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1505 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1506 | mz_zip_print("Zip - Close\n"); |
| 1507 | |
| 1508 | if (mz_zip_entry_is_open(handle) == MZ_OK) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1509 | err = mz_zip_entry_close(handle); |
Nathan Moinvaziri | effc142 | 2018-11-08 15:24:17 -0800 | [diff] [blame] | 1510 | |
| 1511 | if ((err == MZ_OK) && (zip->open_mode & MZ_OPEN_MODE_WRITE)) |
| 1512 | err = mz_zip_write_cd(handle); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1513 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1514 | if (zip->cd_mem_stream != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1515 | mz_stream_close(zip->cd_mem_stream); |
| 1516 | mz_stream_delete(&zip->cd_mem_stream); |
| 1517 | } |
| 1518 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1519 | if (zip->file_info_stream != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1520 | mz_stream_mem_close(zip->file_info_stream); |
| 1521 | mz_stream_mem_delete(&zip->file_info_stream); |
| 1522 | } |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1523 | if (zip->local_file_info_stream != NULL) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1524 | mz_stream_mem_close(zip->local_file_info_stream); |
| 1525 | mz_stream_mem_delete(&zip->local_file_info_stream); |
| 1526 | } |
| 1527 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1528 | if (zip->comment) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1529 | MZ_FREE(zip->comment); |
| 1530 | zip->comment = NULL; |
| 1531 | } |
| 1532 | |
| 1533 | zip->stream = NULL; |
| 1534 | zip->cd_stream = NULL; |
| 1535 | |
| 1536 | return err; |
| 1537 | } |
| 1538 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1539 | int32_t mz_zip_get_comment(void *handle, const char **comment) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1540 | mz_zip *zip = (mz_zip *)handle; |
| 1541 | if (zip == NULL || comment == NULL) |
| 1542 | return MZ_PARAM_ERROR; |
| 1543 | if (zip->comment == NULL) |
| 1544 | return MZ_EXIST_ERROR; |
| 1545 | *comment = zip->comment; |
| 1546 | return MZ_OK; |
| 1547 | } |
| 1548 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1549 | int32_t mz_zip_set_comment(void *handle, const char *comment) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1550 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1551 | int32_t comment_size = 0; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1552 | if (zip == NULL || comment == NULL) |
| 1553 | return MZ_PARAM_ERROR; |
| 1554 | if (zip->comment != NULL) |
| 1555 | MZ_FREE(zip->comment); |
Nathan Moinvaziri | 2df1ecb | 2018-12-01 08:59:21 -0800 | [diff] [blame] | 1556 | comment_size = (int32_t)strlen(comment); |
| 1557 | if (comment_size > UINT16_MAX) |
| 1558 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | a6ecab5 | 2019-01-22 13:14:01 -0800 | [diff] [blame] | 1559 | zip->comment = (char *)MZ_ALLOC(comment_size+1); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1560 | if (zip->comment == NULL) |
| 1561 | return MZ_MEM_ERROR; |
Nathan Moinvaziri | a6ecab5 | 2019-01-22 13:14:01 -0800 | [diff] [blame] | 1562 | memset(zip->comment, 0, comment_size+1); |
Nathan Moinvaziri | 2df1ecb | 2018-12-01 08:59:21 -0800 | [diff] [blame] | 1563 | strncpy(zip->comment, comment, comment_size); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1564 | return MZ_OK; |
| 1565 | } |
| 1566 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1567 | int32_t mz_zip_get_version_madeby(void *handle, uint16_t *version_madeby) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1568 | mz_zip *zip = (mz_zip *)handle; |
| 1569 | if (zip == NULL || version_madeby == NULL) |
| 1570 | return MZ_PARAM_ERROR; |
| 1571 | *version_madeby = zip->version_madeby; |
| 1572 | return MZ_OK; |
| 1573 | } |
| 1574 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1575 | int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1576 | mz_zip *zip = (mz_zip *)handle; |
| 1577 | if (zip == NULL) |
| 1578 | return MZ_PARAM_ERROR; |
| 1579 | zip->version_madeby = version_madeby; |
| 1580 | return MZ_OK; |
| 1581 | } |
| 1582 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1583 | int32_t mz_zip_set_recover(void *handle, uint8_t recover) { |
Nathan Moinvaziri | dd103f4 | 2018-11-13 14:50:32 -0800 | [diff] [blame] | 1584 | mz_zip *zip = (mz_zip *)handle; |
| 1585 | if (zip == NULL) |
| 1586 | return MZ_PARAM_ERROR; |
| 1587 | zip->recover = recover; |
| 1588 | return MZ_OK; |
| 1589 | } |
| 1590 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1591 | int32_t mz_zip_set_data_descriptor(void *handle, uint8_t data_descriptor) { |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 1592 | mz_zip *zip = (mz_zip *)handle; |
| 1593 | if (zip == NULL) |
| 1594 | return MZ_PARAM_ERROR; |
| 1595 | zip->data_descriptor = data_descriptor; |
| 1596 | return MZ_OK; |
| 1597 | } |
| 1598 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1599 | int32_t mz_zip_get_stream(void *handle, void **stream) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1600 | mz_zip *zip = (mz_zip *)handle; |
| 1601 | if (zip == NULL || stream == NULL) |
| 1602 | return MZ_PARAM_ERROR; |
| 1603 | *stream = zip->stream; |
| 1604 | if (*stream == NULL) |
| 1605 | return MZ_EXIST_ERROR; |
| 1606 | return MZ_OK; |
| 1607 | } |
| 1608 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1609 | int32_t mz_zip_set_cd_stream(void *handle, int64_t cd_start_pos, void *cd_stream) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1610 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 4d08973 | 2018-11-19 20:24:26 -0800 | [diff] [blame] | 1611 | if (zip == NULL || cd_stream == NULL) |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1612 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | be483d8 | 2019-10-19 17:30:23 -0700 | [diff] [blame] | 1613 | zip->cd_offset = 0; |
Nathan Moinvaziri | 4d08973 | 2018-11-19 20:24:26 -0800 | [diff] [blame] | 1614 | zip->cd_stream = cd_stream; |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1615 | zip->cd_start_pos = cd_start_pos; |
| 1616 | return MZ_OK; |
| 1617 | } |
| 1618 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1619 | int32_t mz_zip_get_cd_mem_stream(void *handle, void **cd_mem_stream) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1620 | mz_zip *zip = (mz_zip *)handle; |
| 1621 | if (zip == NULL || cd_mem_stream == NULL) |
| 1622 | return MZ_PARAM_ERROR; |
| 1623 | *cd_mem_stream = zip->cd_mem_stream; |
| 1624 | if (*cd_mem_stream == NULL) |
| 1625 | return MZ_EXIST_ERROR; |
| 1626 | return MZ_OK; |
| 1627 | } |
| 1628 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1629 | int32_t mz_zip_set_number_entry(void *handle, uint64_t number_entry) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 1630 | mz_zip *zip = (mz_zip *)handle; |
| 1631 | if (zip == NULL) |
| 1632 | return MZ_PARAM_ERROR; |
| 1633 | zip->number_entry = number_entry; |
| 1634 | return MZ_OK; |
| 1635 | } |
| 1636 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1637 | int32_t mz_zip_get_number_entry(void *handle, uint64_t *number_entry) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 1638 | mz_zip *zip = (mz_zip *)handle; |
| 1639 | if (zip == NULL || number_entry == NULL) |
| 1640 | return MZ_PARAM_ERROR; |
| 1641 | *number_entry = zip->number_entry; |
| 1642 | return MZ_OK; |
| 1643 | } |
| 1644 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1645 | int32_t mz_zip_set_disk_number_with_cd(void *handle, uint32_t disk_number_with_cd) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 1646 | mz_zip *zip = (mz_zip *)handle; |
| 1647 | if (zip == NULL) |
| 1648 | return MZ_PARAM_ERROR; |
| 1649 | zip->disk_number_with_cd = disk_number_with_cd; |
| 1650 | return MZ_OK; |
| 1651 | } |
| 1652 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1653 | int32_t mz_zip_get_disk_number_with_cd(void *handle, uint32_t *disk_number_with_cd) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 1654 | mz_zip *zip = (mz_zip *)handle; |
| 1655 | if (zip == NULL || disk_number_with_cd == NULL) |
| 1656 | return MZ_PARAM_ERROR; |
| 1657 | *disk_number_with_cd = zip->disk_number_with_cd; |
| 1658 | return MZ_OK; |
| 1659 | } |
| 1660 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1661 | static int32_t mz_zip_entry_close_int(void *handle) { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1662 | mz_zip *zip = (mz_zip *)handle; |
| 1663 | |
| 1664 | if (zip->crypt_stream != NULL) |
| 1665 | mz_stream_delete(&zip->crypt_stream); |
| 1666 | zip->crypt_stream = NULL; |
| 1667 | if (zip->compress_stream != NULL) |
| 1668 | mz_stream_delete(&zip->compress_stream); |
| 1669 | zip->compress_stream = NULL; |
| 1670 | |
| 1671 | zip->entry_opened = 0; |
| 1672 | |
| 1673 | return MZ_OK; |
| 1674 | } |
| 1675 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1676 | static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress_level, const char *password) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1677 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1678 | int64_t max_total_in = 0; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1679 | int64_t header_size = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1680 | int64_t footer_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1681 | int32_t err = MZ_OK; |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1682 | uint8_t use_crypt = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1683 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1684 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1685 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1686 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1687 | switch (zip->file_info.compression_method) { |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1688 | case MZ_COMPRESS_METHOD_STORE: |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1689 | case MZ_COMPRESS_METHOD_DEFLATE: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1690 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1691 | case MZ_COMPRESS_METHOD_BZIP2: |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1692 | #endif |
Nathan Moinvaziri | 566dfe0 | 2018-10-26 00:36:30 -0700 | [diff] [blame] | 1693 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1694 | case MZ_COMPRESS_METHOD_LZMA: |
Nathan Moinvaziri | 1a7e7e4 | 2020-10-25 14:50:53 -0700 | [diff] [blame] | 1695 | #endif |
| 1696 | #if defined(HAVE_LZMA) || defined(HAVE_LIBCOMP) |
Nathan Moinvaziri | c4668ed | 2020-10-25 11:56:19 -0700 | [diff] [blame] | 1697 | case MZ_COMPRESS_METHOD_XZ: |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1698 | #endif |
Nathan Moinvaziri | 1f4758b | 2020-06-14 21:52:55 -0700 | [diff] [blame] | 1699 | #ifdef HAVE_ZSTD |
| 1700 | case MZ_COMPRESS_METHOD_ZSTD: |
Nathan Moinvaziri | 1f4758b | 2020-06-14 21:52:55 -0700 | [diff] [blame] | 1701 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1702 | err = MZ_OK; |
| 1703 | break; |
| 1704 | default: |
Nathan Moinvaziri | 829ffb5 | 2018-08-14 14:00:16 -0700 | [diff] [blame] | 1705 | return MZ_SUPPORT_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1706 | } |
| 1707 | |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 1708 | #ifndef HAVE_WZAES |
| 1709 | if (zip->file_info.aes_version) |
| 1710 | return MZ_SUPPORT_ERROR; |
| 1711 | #endif |
| 1712 | |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1713 | zip->entry_raw = raw; |
| 1714 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1715 | if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password != NULL)) { |
| 1716 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1717 | /* Encrypt only when we are not trying to write raw and password is supplied. */ |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1718 | if (!zip->entry_raw) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1719 | use_crypt = 1; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1720 | } else if (zip->open_mode & MZ_OPEN_MODE_READ) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1721 | /* Decrypt only when password is supplied. Don't error when password */ |
| 1722 | /* is not supplied as we may want to read the raw encrypted data. */ |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1723 | use_crypt = 1; |
| 1724 | } |
| 1725 | } |
| 1726 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1727 | if ((err == MZ_OK) && (use_crypt)) { |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 1728 | #ifdef HAVE_WZAES |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1729 | if (zip->file_info.aes_version) { |
Nathan Moinvaziri | 21a3102 | 2018-10-24 09:50:16 -0700 | [diff] [blame] | 1730 | mz_stream_wzaes_create(&zip->crypt_stream); |
| 1731 | mz_stream_wzaes_set_password(zip->crypt_stream, password); |
| 1732 | mz_stream_wzaes_set_encryption_mode(zip->crypt_stream, zip->file_info.aes_encryption_mode); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1733 | } else |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1734 | #endif |
| 1735 | { |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1736 | #ifdef HAVE_PKCRYPT |
Nathan Moinvaziri | 9ffb08e | 2020-11-30 21:30:10 -0800 | [diff] [blame] | 1737 | uint8_t verify1 = (uint8_t)((zip->file_info.pk_verify >> 8) & 0xff); |
| 1738 | uint8_t verify2 = (uint8_t)((zip->file_info.pk_verify) & 0xff); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1739 | |
Nathan Moinvaziri | 0e5c9dc | 2018-05-23 20:21:48 -0700 | [diff] [blame] | 1740 | mz_stream_pkcrypt_create(&zip->crypt_stream); |
| 1741 | mz_stream_pkcrypt_set_password(zip->crypt_stream, password); |
| 1742 | mz_stream_pkcrypt_set_verify(zip->crypt_stream, verify1, verify2); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1743 | #endif |
| 1744 | } |
| 1745 | } |
| 1746 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1747 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1748 | if (zip->crypt_stream == NULL) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1749 | mz_stream_raw_create(&zip->crypt_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1750 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1751 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1752 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1753 | err = mz_stream_open(zip->crypt_stream, NULL, zip->open_mode); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1754 | } |
| 1755 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1756 | if (err == MZ_OK) { |
Nathan Moinvaziri | a64c919 | 2018-08-08 17:47:12 -0700 | [diff] [blame] | 1757 | if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1758 | mz_stream_raw_create(&zip->compress_stream); |
Nathan Moinvaziri | 052ceb1 | 2020-12-27 17:38:43 -0800 | [diff] [blame] | 1759 | #ifdef HAVE_ZLIB |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1760 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1761 | mz_stream_zlib_create(&zip->compress_stream); |
Andy Maloney | 3909c23 | 2018-05-22 09:02:09 -0400 | [diff] [blame] | 1762 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1763 | #ifdef HAVE_BZIP2 |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1764 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_BZIP2) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1765 | mz_stream_bzip_create(&zip->compress_stream); |
| 1766 | #endif |
Nathan Moinvaziri | 1a7e7e4 | 2020-10-25 14:50:53 -0700 | [diff] [blame] | 1767 | #ifdef HAVE_LIBCOMP |
Nathan Moinvaziri | 052ceb1 | 2020-12-27 17:38:43 -0800 | [diff] [blame] | 1768 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE || |
| 1769 | zip->file_info.compression_method == MZ_COMPRESS_METHOD_XZ) { |
Nathan Moinvaziri | a734386 | 2020-10-25 15:22:10 -0700 | [diff] [blame] | 1770 | mz_stream_libcomp_create(&zip->compress_stream); |
Nathan Moinvaziri | 1a7e7e4 | 2020-10-25 14:50:53 -0700 | [diff] [blame] | 1771 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_METHOD, |
| 1772 | zip->file_info.compression_method); |
| 1773 | } |
| 1774 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1775 | #ifdef HAVE_LZMA |
Nathan Moinvaziri | c4668ed | 2020-10-25 11:56:19 -0700 | [diff] [blame] | 1776 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA || |
| 1777 | zip->file_info.compression_method == MZ_COMPRESS_METHOD_XZ) { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1778 | mz_stream_lzma_create(&zip->compress_stream); |
Nathan Moinvaziri | ff7ef66 | 2020-10-25 12:27:29 -0700 | [diff] [blame] | 1779 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_METHOD, |
| 1780 | zip->file_info.compression_method); |
| 1781 | } |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1782 | #endif |
Nathan Moinvaziri | 1f4758b | 2020-06-14 21:52:55 -0700 | [diff] [blame] | 1783 | #ifdef HAVE_ZSTD |
Force Charlie | 32ccb3e | 2020-06-24 10:55:18 +0800 | [diff] [blame] | 1784 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_ZSTD) |
Nathan Moinvaziri | 1f4758b | 2020-06-14 21:52:55 -0700 | [diff] [blame] | 1785 | mz_stream_zstd_create(&zip->compress_stream); |
| 1786 | #endif |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1787 | else |
| 1788 | err = MZ_PARAM_ERROR; |
| 1789 | } |
| 1790 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1791 | if (err == MZ_OK) { |
| 1792 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1793 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_LEVEL, compress_level); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1794 | } else { |
Nathan Moinvaziri | 9126177 | 2020-06-19 21:16:16 -0700 | [diff] [blame] | 1795 | int32_t set_end_of_stream = 0; |
| 1796 | |
Nathan Moinvaziri | 76fb890 | 2018-11-21 15:14:09 -0800 | [diff] [blame] | 1797 | #ifndef HAVE_LIBCOMP |
Nathan Moinvaziri | ff7ef66 | 2020-10-25 12:27:29 -0700 | [diff] [blame] | 1798 | if (zip->entry_raw || |
| 1799 | zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE || |
| 1800 | zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) |
Nathan Moinvaziri | 90d31c7 | 2018-11-20 03:17:20 -0800 | [diff] [blame] | 1801 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1802 | { |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1803 | max_total_in = zip->file_info.compressed_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1804 | mz_stream_set_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in); |
| 1805 | |
| 1806 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_HEADER_SIZE, &header_size) == MZ_OK) |
| 1807 | max_total_in -= header_size; |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1808 | if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_FOOTER_SIZE, &footer_size) == MZ_OK) |
| 1809 | max_total_in -= footer_size; |
Nathan Moinvaziri | fa8105b | 2018-07-08 19:05:00 -0700 | [diff] [blame] | 1810 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1811 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1812 | } |
Nathan Moinvaziri | 9126177 | 2020-06-19 21:16:16 -0700 | [diff] [blame] | 1813 | |
| 1814 | switch (zip->file_info.compression_method) { |
| 1815 | case MZ_COMPRESS_METHOD_LZMA: |
Nathan Moinvaziri | 5cd2879 | 2020-10-25 12:50:12 -0700 | [diff] [blame] | 1816 | case MZ_COMPRESS_METHOD_XZ: |
Nathan Moinvaziri | 9126177 | 2020-06-19 21:16:16 -0700 | [diff] [blame] | 1817 | set_end_of_stream = (zip->file_info.flag & MZ_ZIP_FLAG_LZMA_EOS_MARKER); |
| 1818 | break; |
| 1819 | case MZ_COMPRESS_METHOD_ZSTD: |
Nathan Moinvaziri | 9126177 | 2020-06-19 21:16:16 -0700 | [diff] [blame] | 1820 | set_end_of_stream = 1; |
| 1821 | break; |
juanii | 55bcdaf | 2018-02-11 20:55:57 -0300 | [diff] [blame] | 1822 | } |
Nathan Moinvaziri | 9126177 | 2020-06-19 21:16:16 -0700 | [diff] [blame] | 1823 | |
| 1824 | if (set_end_of_stream) { |
Force.Charlie | 7cecfa6 | 2020-06-15 07:43:25 -0700 | [diff] [blame] | 1825 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, zip->file_info.compressed_size); |
| 1826 | mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT_MAX, zip->file_info.uncompressed_size); |
| 1827 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1828 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1829 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1830 | mz_stream_set_base(zip->compress_stream, zip->crypt_stream); |
| 1831 | |
| 1832 | err = mz_stream_open(zip->compress_stream, NULL, zip->open_mode); |
| 1833 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1834 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1835 | if (err == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1836 | zip->entry_opened = 1; |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 1837 | zip->entry_crc32 = 0; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1838 | } else { |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1839 | mz_zip_entry_close_int(handle); |
| 1840 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1841 | |
| 1842 | return err; |
| 1843 | } |
| 1844 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1845 | int32_t mz_zip_entry_is_open(void *handle) { |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1846 | mz_zip *zip = (mz_zip *)handle; |
| 1847 | if (zip == NULL) |
| 1848 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 1849 | if (zip->entry_opened == 0) |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 1850 | return MZ_EXIST_ERROR; |
| 1851 | return MZ_OK; |
| 1852 | } |
| 1853 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1854 | int32_t mz_zip_entry_read_open(void *handle, uint8_t raw, const char *password) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1855 | mz_zip *zip = (mz_zip *)handle; |
| 1856 | int32_t err = MZ_OK; |
Nathan Moinvaziri | aacf873 | 2018-11-06 09:38:46 -0800 | [diff] [blame] | 1857 | int32_t err_shift = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1858 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1859 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1860 | if (password != NULL) |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 1861 | return MZ_SUPPORT_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1862 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1863 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1864 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 1865 | if ((zip->open_mode & MZ_OPEN_MODE_READ) == 0) |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1866 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1867 | if (zip->entry_scanned == 0) |
| 1868 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1869 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 1870 | mz_zip_print("Zip - Entry - Read open (raw %" PRId32 ")\n", raw); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1871 | |
Nathan Moinvaziri | 0030fa2 | 2020-12-21 19:31:07 -0800 | [diff] [blame] | 1872 | err = mz_zip_entry_seek_local_header(handle); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1873 | if (err == MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1874 | err = mz_zip_entry_read_header(zip->stream, 1, &zip->local_file_info, zip->local_file_info_stream); |
Nathan Moinvaziri | 903b73d | 2017-10-20 08:47:19 -0700 | [diff] [blame] | 1875 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1876 | if (err == MZ_FORMAT_ERROR && zip->disk_offset_shift > 0) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1877 | /* Perhaps we didn't compensated correctly for incorrect cd offset */ |
Nathan Moinvaziri | aacf873 | 2018-11-06 09:38:46 -0800 | [diff] [blame] | 1878 | err_shift = mz_stream_seek(zip->stream, zip->file_info.disk_offset, MZ_SEEK_SET); |
| 1879 | if (err_shift == MZ_OK) |
| 1880 | err_shift = mz_zip_entry_read_header(zip->stream, 1, &zip->local_file_info, zip->local_file_info_stream); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1881 | if (err_shift == MZ_OK) { |
Nathan Moinvaziri | aacf873 | 2018-11-06 09:38:46 -0800 | [diff] [blame] | 1882 | zip->disk_offset_shift = 0; |
| 1883 | err = err_shift; |
| 1884 | } |
| 1885 | } |
| 1886 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 1887 | #ifdef MZ_ZIP_NO_DECOMPRESSION |
Nathan Moinvaziri | 2eb2907 | 2018-11-23 10:32:21 -0800 | [diff] [blame] | 1888 | if (!raw && zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 1889 | err = MZ_SUPPORT_ERROR; |
Viktor Szakats | e721507 | 2018-09-04 15:06:53 +0000 | [diff] [blame] | 1890 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1891 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1892 | err = mz_zip_entry_open_int(handle, raw, 0, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1893 | |
| 1894 | return err; |
| 1895 | } |
| 1896 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1897 | int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int16_t compress_level, uint8_t raw, const char *password) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1898 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1899 | int64_t filename_pos = -1; |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 1900 | int64_t extrafield_pos = 0; |
| 1901 | int64_t comment_pos = 0; |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 1902 | int64_t linkname_pos = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1903 | int64_t disk_number = 0; |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1904 | uint8_t is_dir = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1905 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1906 | |
Nathan Moinvaziri | 4042763 | 2018-07-22 11:12:40 -0700 | [diff] [blame] | 1907 | #if defined(MZ_ZIP_NO_ENCRYPTION) |
tz-lom | b1b2580 | 2017-11-10 15:03:02 +0300 | [diff] [blame] | 1908 | if (password != NULL) |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 1909 | return MZ_SUPPORT_ERROR; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1910 | #endif |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1911 | if (zip == NULL || file_info == NULL || file_info->filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1912 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1913 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1914 | if (mz_zip_entry_is_open(handle) == MZ_OK) { |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1915 | err = mz_zip_entry_close(handle); |
| 1916 | if (err != MZ_OK) |
| 1917 | return err; |
| 1918 | } |
| 1919 | |
| 1920 | memcpy(&zip->file_info, file_info, sizeof(mz_zip_file)); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1921 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 1922 | mz_zip_print("Zip - Entry - Write open - %s (level %" PRId16 " raw %" PRId8 ")\n", |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1923 | zip->file_info.filename, compress_level, raw); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1924 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 1925 | mz_stream_seek(zip->file_info_stream, 0, MZ_SEEK_SET); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1926 | mz_stream_write(zip->file_info_stream, file_info, sizeof(mz_zip_file)); |
| 1927 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 1928 | /* Copy filename, extrafield, and comment internally */ |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1929 | filename_pos = mz_stream_tell(zip->file_info_stream); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1930 | if (file_info->filename != NULL) |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1931 | mz_stream_write(zip->file_info_stream, file_info->filename, (int32_t)strlen(file_info->filename)); |
| 1932 | mz_stream_write_uint8(zip->file_info_stream, 0); |
| 1933 | |
| 1934 | extrafield_pos = mz_stream_tell(zip->file_info_stream); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1935 | if (file_info->extrafield != NULL) |
Nathan Moinvaziri | ca014e6 | 2018-08-15 07:31:12 -0700 | [diff] [blame] | 1936 | mz_stream_write(zip->file_info_stream, file_info->extrafield, file_info->extrafield_size); |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1937 | mz_stream_write_uint8(zip->file_info_stream, 0); |
| 1938 | |
| 1939 | comment_pos = mz_stream_tell(zip->file_info_stream); |
Nathan Moinvaziri | f5cc4c0 | 2018-08-14 17:46:36 -0700 | [diff] [blame] | 1940 | if (file_info->comment != NULL) |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1941 | mz_stream_write(zip->file_info_stream, file_info->comment, file_info->comment_size); |
| 1942 | mz_stream_write_uint8(zip->file_info_stream, 0); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1943 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 1944 | linkname_pos = mz_stream_tell(zip->file_info_stream); |
| 1945 | if (file_info->linkname != NULL) |
| 1946 | mz_stream_write(zip->file_info_stream, file_info->linkname, (int32_t)strlen(file_info->linkname)); |
| 1947 | mz_stream_write_uint8(zip->file_info_stream, 0); |
Nathan Moinvaziri | 6b64b92 | 2018-11-23 11:41:35 -0800 | [diff] [blame] | 1948 | |
Nathan Moinvaziri | f9e3448 | 2018-11-27 09:45:09 -0800 | [diff] [blame] | 1949 | mz_stream_mem_get_buffer_at(zip->file_info_stream, filename_pos, (const void **)&zip->file_info.filename); |
| 1950 | mz_stream_mem_get_buffer_at(zip->file_info_stream, extrafield_pos, (const void **)&zip->file_info.extrafield); |
| 1951 | mz_stream_mem_get_buffer_at(zip->file_info_stream, comment_pos, (const void **)&zip->file_info.comment); |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 1952 | mz_stream_mem_get_buffer_at(zip->file_info_stream, linkname_pos, (const void **)&zip->file_info.linkname); |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 1953 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1954 | if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE) { |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1955 | if ((compress_level == 8) || (compress_level == 9)) |
| 1956 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_MAX; |
| 1957 | if (compress_level == 2) |
| 1958 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_FAST; |
| 1959 | if (compress_level == 1) |
| 1960 | zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_SUPER_FAST; |
| 1961 | } |
Nathan Moinvaziri | 1a7e7e4 | 2020-10-25 14:50:53 -0700 | [diff] [blame] | 1962 | #if defined(HAVE_LZMA) || defined(HAVE_LIBCOMP) |
Nathan Moinvaziri | 5cd2879 | 2020-10-25 12:50:12 -0700 | [diff] [blame] | 1963 | else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA || |
| 1964 | zip->file_info.compression_method == MZ_COMPRESS_METHOD_XZ) |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1965 | zip->file_info.flag |= MZ_ZIP_FLAG_LZMA_EOS_MARKER; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1966 | #endif |
Nathan Moinvaziri | 91a76f6 | 2017-11-10 07:39:06 -0800 | [diff] [blame] | 1967 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1968 | if (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK) |
| 1969 | is_dir = 1; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1970 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 1971 | if (!is_dir) { |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 1972 | if (zip->data_descriptor) |
| 1973 | zip->file_info.flag |= MZ_ZIP_FLAG_DATA_DESCRIPTOR; |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1974 | if (password != NULL) |
| 1975 | zip->file_info.flag |= MZ_ZIP_FLAG_ENCRYPTED; |
| 1976 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1977 | |
juanii | b8887e9 | 2018-02-14 00:51:05 -0300 | [diff] [blame] | 1978 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number); |
| 1979 | zip->file_info.disk_number = (uint32_t)disk_number; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1980 | zip->file_info.disk_offset = mz_stream_tell(zip->stream); |
Nathan Moinvaziri | 215a7a8 | 2020-12-13 10:58:41 -0800 | [diff] [blame] | 1981 | |
| 1982 | if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) { |
| 1983 | #ifdef HAVE_PKCRYPT |
| 1984 | /* Pre-calculated CRC value is required for PKWARE traditional encryption */ |
| 1985 | uint32_t dos_date = mz_zip_time_t_to_dos_date(zip->file_info.modified_date); |
| 1986 | zip->file_info.pk_verify = mz_zip_get_pk_verify(dos_date, zip->file_info.crc, zip->file_info.flag); |
| 1987 | #endif |
| 1988 | #ifdef HAVE_WZAES |
| 1989 | if (zip->file_info.aes_version && zip->file_info.aes_encryption_mode == 0) |
| 1990 | zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256; |
| 1991 | #endif |
| 1992 | } |
| 1993 | |
Nathan Moinvaziri | a66cc31 | 2017-10-18 16:51:10 -0700 | [diff] [blame] | 1994 | zip->file_info.crc = 0; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 1995 | zip->file_info.compressed_size = 0; |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 1996 | |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 1997 | if ((compress_level == 0) || (is_dir)) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 1998 | zip->file_info.compression_method = MZ_COMPRESS_METHOD_STORE; |
Viktor Szakats | 2884e67 | 2018-04-30 08:12:13 +0000 | [diff] [blame] | 1999 | |
Nathan Moinvaziri | a6d1f66 | 2018-07-22 10:35:49 -0700 | [diff] [blame] | 2000 | #ifdef MZ_ZIP_NO_COMPRESSION |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 2001 | if (zip->file_info.compression_method != MZ_COMPRESS_METHOD_STORE) |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 2002 | err = MZ_SUPPORT_ERROR; |
| 2003 | #endif |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2004 | if (err == MZ_OK) |
Nathan Moinvaziri | fa620e4 | 2018-10-20 10:37:10 -0700 | [diff] [blame] | 2005 | err = mz_zip_entry_write_header(zip->stream, 1, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2006 | if (err == MZ_OK) |
Nathan Moinvaziri | fa146ad | 2018-08-07 23:50:31 -0700 | [diff] [blame] | 2007 | err = mz_zip_entry_open_int(handle, raw, compress_level, password); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2008 | |
| 2009 | return err; |
| 2010 | } |
| 2011 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2012 | int32_t mz_zip_entry_read(void *handle, void *buf, int32_t len) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2013 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2014 | int32_t read = 0; |
| 2015 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2016 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2017 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2018 | if (UINT_MAX == UINT16_MAX && len > UINT16_MAX) /* zlib limitation */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2019 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | d7814e9 | 2018-07-11 14:54:14 -0700 | [diff] [blame] | 2020 | if (len == 0) |
| 2021 | return MZ_PARAM_ERROR; |
| 2022 | |
Nathan Moinvaziri | eb80cd9 | 2018-07-11 16:45:09 -0700 | [diff] [blame] | 2023 | if (zip->file_info.compressed_size == 0) |
| 2024 | return 0; |
| 2025 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2026 | /* Read entire entry even if uncompressed_size = 0, otherwise */ |
| 2027 | /* aes encryption validation will fail if compressed_size > 0 */ |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 2028 | read = mz_stream_read(zip->compress_stream, buf, len); |
| 2029 | if (read > 0) |
| 2030 | zip->entry_crc32 = mz_crypt_crc32_update(zip->entry_crc32, buf, read); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2031 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 2032 | mz_zip_print("Zip - Entry - Read - %" PRId32 " (max %" PRId32 ")\n", read, len); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2033 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2034 | return read; |
| 2035 | } |
| 2036 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2037 | int32_t mz_zip_entry_write(void *handle, const void *buf, int32_t len) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2038 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 2039 | int32_t written = 0; |
| 2040 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2041 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2042 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | e63d231 | 2018-11-03 19:45:41 -0700 | [diff] [blame] | 2043 | written = mz_stream_write(zip->compress_stream, buf, len); |
| 2044 | if (written > 0) |
| 2045 | zip->entry_crc32 = mz_crypt_crc32_update(zip->entry_crc32, buf, written); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2046 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 2047 | mz_zip_print("Zip - Entry - Write - %" PRId32 " (max %" PRId32 ")\n", written, len); |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2048 | |
Nathan Moinvaziri | 0a9282d | 2018-06-19 11:59:07 -0700 | [diff] [blame] | 2049 | return written; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2050 | } |
| 2051 | |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2052 | int32_t mz_zip_entry_read_close(void *handle, uint32_t *crc32, int64_t *compressed_size, |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2053 | int64_t *uncompressed_size) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2054 | mz_zip *zip = (mz_zip *)handle; |
| 2055 | int64_t total_in = 0; |
| 2056 | int32_t err = MZ_OK; |
| 2057 | uint8_t zip64 = 0; |
| 2058 | |
| 2059 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
| 2060 | return MZ_PARAM_ERROR; |
| 2061 | |
| 2062 | mz_stream_close(zip->compress_stream); |
| 2063 | |
| 2064 | mz_zip_print("Zip - Entry - Read Close\n"); |
| 2065 | |
| 2066 | if (crc32 != NULL) |
| 2067 | *crc32 = zip->file_info.crc; |
| 2068 | if (compressed_size != NULL) |
| 2069 | *compressed_size = zip->file_info.compressed_size; |
| 2070 | if (uncompressed_size != NULL) |
| 2071 | *uncompressed_size = zip->file_info.uncompressed_size; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2072 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2073 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN, &total_in); |
| 2074 | |
| 2075 | if ((zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) && |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2076 | ((zip->file_info.flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO) == 0) && |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2077 | (crc32 != NULL || compressed_size != NULL || uncompressed_size != NULL)) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2078 | /* Check to see if data descriptor is zip64 bit format or not */ |
| 2079 | if (mz_zip_extrafield_contains(zip->local_file_info.extrafield, |
| 2080 | zip->local_file_info.extrafield_size, MZ_ZIP_EXTENSION_ZIP64, NULL) == MZ_OK) |
| 2081 | zip64 = 1; |
| 2082 | |
Nathan Moinvaziri | 0030fa2 | 2020-12-21 19:31:07 -0800 | [diff] [blame] | 2083 | err = mz_zip_entry_seek_local_header(handle); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2084 | |
| 2085 | /* Seek to end of compressed stream since we might have over-read during compression */ |
| 2086 | if (err == MZ_OK) |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2087 | err = mz_stream_seek(zip->stream, MZ_ZIP_SIZE_LD_ITEM + |
| 2088 | (int64_t)zip->local_file_info.filename_size + |
| 2089 | (int64_t)zip->local_file_info.extrafield_size + |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2090 | total_in, MZ_SEEK_CUR); |
| 2091 | |
| 2092 | /* Read data descriptor */ |
| 2093 | if (err == MZ_OK) |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2094 | err = mz_zip_entry_read_descriptor(zip->stream, zip64, |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2095 | crc32, compressed_size, uncompressed_size); |
| 2096 | } |
| 2097 | |
| 2098 | /* If entire entry was not read verification will fail */ |
Markus Alind | ff81730 | 2022-11-01 16:35:20 +0100 | [diff] [blame] | 2099 | if ((err == MZ_OK) && (total_in == zip->file_info.compressed_size) && (!zip->entry_raw)) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2100 | #ifdef HAVE_WZAES |
| 2101 | /* AES zip version AE-1 will expect a valid crc as well */ |
| 2102 | if (zip->file_info.aes_version <= 0x0001) |
| 2103 | #endif |
| 2104 | { |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2105 | if (zip->entry_crc32 != zip->file_info.crc) { |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 2106 | mz_zip_print("Zip - Entry - Crc failed (actual 0x%08" PRIx32 " expected 0x%08" PRIx32 ")\n", |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2107 | zip->entry_crc32, zip->file_info.crc); |
| 2108 | |
| 2109 | err = MZ_CRC_ERROR; |
| 2110 | } |
| 2111 | } |
| 2112 | } |
| 2113 | |
| 2114 | mz_zip_entry_close_int(handle); |
| 2115 | |
| 2116 | return err; |
| 2117 | } |
| 2118 | |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2119 | int32_t mz_zip_entry_write_close(void *handle, uint32_t crc32, int64_t compressed_size, |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2120 | int64_t uncompressed_size) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2121 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2122 | int64_t end_disk_number = 0; |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2123 | int32_t err = MZ_OK; |
| 2124 | uint8_t zip64 = 0; |
| 2125 | |
| 2126 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
| 2127 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2128 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2129 | mz_stream_close(zip->compress_stream); |
| 2130 | |
| 2131 | if (!zip->entry_raw) |
| 2132 | crc32 = zip->entry_crc32; |
| 2133 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 2134 | mz_zip_print("Zip - Entry - Write Close (crc 0x%08" PRIx32 " cs %" PRId64 " ucs %" PRId64 ")\n", |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2135 | crc32, compressed_size, uncompressed_size); |
| 2136 | |
| 2137 | /* If sizes are not set, then read them from the compression stream */ |
| 2138 | if (compressed_size < 0) |
| 2139 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT, &compressed_size); |
| 2140 | if (uncompressed_size < 0) |
Nathan Moinvaziri | d931843 | 2018-12-01 07:56:28 -0800 | [diff] [blame] | 2141 | mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN, &uncompressed_size); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2142 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2143 | if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2144 | mz_stream_set_base(zip->crypt_stream, zip->stream); |
| 2145 | err = mz_stream_close(zip->crypt_stream); |
| 2146 | |
| 2147 | mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_OUT, &compressed_size); |
| 2148 | } |
| 2149 | |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 2150 | mz_zip_entry_needs_zip64(&zip->file_info, 1, &zip64); |
| 2151 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2152 | if ((err == MZ_OK) && (zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR)) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2153 | /* Determine if we need to write data descriptor in zip64 format, |
| 2154 | if local extrafield was saved with zip64 extrafield */ |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2155 | |
| 2156 | if (zip->file_info.flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO) |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2157 | err = mz_zip_entry_write_descriptor(zip->stream, |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2158 | zip64, 0, compressed_size, 0); |
| 2159 | else |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2160 | err = mz_zip_entry_write_descriptor(zip->stream, |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2161 | zip64, crc32, compressed_size, uncompressed_size); |
| 2162 | } |
| 2163 | |
| 2164 | /* Write file info to central directory */ |
| 2165 | |
Nathan Moinvaziri | fe33c3d | 2019-09-16 11:07:43 -0700 | [diff] [blame] | 2166 | mz_zip_print("Zip - Entry - Write cd (ucs %" PRId64 " cs %" PRId64 " crc 0x%08" PRIx32 ")\n", |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2167 | uncompressed_size, compressed_size, crc32); |
| 2168 | |
| 2169 | zip->file_info.crc = crc32; |
| 2170 | zip->file_info.compressed_size = compressed_size; |
| 2171 | zip->file_info.uncompressed_size = uncompressed_size; |
| 2172 | |
| 2173 | if (err == MZ_OK) |
| 2174 | err = mz_zip_entry_write_header(zip->cd_mem_stream, 0, &zip->file_info); |
| 2175 | |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2176 | /* Update local header with crc32 and sizes */ |
| 2177 | if ((err == MZ_OK) && ((zip->file_info.flag & MZ_ZIP_FLAG_DATA_DESCRIPTOR) == 0) && |
Nathan Moinvaziri | ca27089 | 2020-12-27 14:54:57 -0800 | [diff] [blame] | 2178 | ((zip->file_info.flag & MZ_ZIP_FLAG_MASK_LOCAL_INFO) == 0)) { |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2179 | /* Save the disk number and position we are to seek back after updating local header */ |
Nathan Moinvaziri | 58b37d3 | 2020-02-08 20:32:58 -0800 | [diff] [blame] | 2180 | int64_t end_pos = mz_stream_tell(zip->stream); |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2181 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &end_disk_number); |
| 2182 | |
Nathan Moinvaziri | 0030fa2 | 2020-12-21 19:31:07 -0800 | [diff] [blame] | 2183 | err = mz_zip_entry_seek_local_header(handle); |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2184 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2185 | if (err == MZ_OK) { |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2186 | /* Seek to crc32 and sizes offset in local header */ |
| 2187 | err = mz_stream_seek(zip->stream, MZ_ZIP_OFFSET_CRC_SIZES, MZ_SEEK_CUR); |
| 2188 | } |
| 2189 | |
| 2190 | if (err == MZ_OK) |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 2191 | err = mz_zip_entry_write_crc_sizes(zip->stream, zip64, 0, &zip->file_info); |
| 2192 | |
| 2193 | /* Seek to and update zip64 extension sizes */ |
Nathan Moinvaziri | 3d83acd | 2020-12-23 11:14:59 -0800 | [diff] [blame] | 2194 | if ((err == MZ_OK) && (zip64)) { |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 2195 | int64_t filename_size = zip->file_info.filename_size; |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 2196 | |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 2197 | if (filename_size == 0) |
| 2198 | filename_size = strlen(zip->file_info.filename); |
| 2199 | |
| 2200 | /* Since we write zip64 extension first we know its offset */ |
| 2201 | err = mz_stream_seek(zip->stream, 2 + 2 + filename_size + 4, MZ_SEEK_CUR); |
| 2202 | |
Nathan Moinvaziri | 3d83acd | 2020-12-23 11:14:59 -0800 | [diff] [blame] | 2203 | if (err == MZ_OK) |
Nathan Moinvaziri | 8516c57 | 2020-12-23 21:59:35 -0800 | [diff] [blame] | 2204 | err = mz_stream_write_uint64(zip->stream, zip->file_info.uncompressed_size); |
| 2205 | if (err == MZ_OK) |
| 2206 | err = mz_stream_write_uint64(zip->stream, zip->file_info.compressed_size); |
Nathan Moinvaziri | ef93d65 | 2020-12-22 17:20:04 -0800 | [diff] [blame] | 2207 | } |
| 2208 | |
Nathan Moinvaziri | 6c87ff4 | 2020-01-03 16:58:16 -0800 | [diff] [blame] | 2209 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, end_disk_number); |
| 2210 | mz_stream_seek(zip->stream, end_pos, MZ_SEEK_SET); |
| 2211 | } |
| 2212 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2213 | zip->number_entry += 1; |
| 2214 | |
| 2215 | mz_zip_entry_close_int(handle); |
| 2216 | |
| 2217 | return err; |
| 2218 | } |
| 2219 | |
Nathan Moinvaziri | 0030fa2 | 2020-12-21 19:31:07 -0800 | [diff] [blame] | 2220 | int32_t mz_zip_entry_seek_local_header(void *handle) { |
| 2221 | mz_zip *zip = (mz_zip *)handle; |
| 2222 | int64_t disk_size = 0; |
| 2223 | uint32_t disk_number = zip->file_info.disk_number; |
| 2224 | |
| 2225 | if (disk_number == zip->disk_number_with_cd) { |
| 2226 | mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size); |
| 2227 | if ((disk_size == 0) || ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0)) |
| 2228 | disk_number = (uint32_t)-1; |
| 2229 | } |
| 2230 | |
| 2231 | mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, disk_number); |
| 2232 | |
| 2233 | mz_zip_print("Zip - Entry - Seek local (disk %" PRId32 " offset %" PRId64 ")\n", |
| 2234 | disk_number, zip->file_info.disk_offset); |
| 2235 | |
| 2236 | /* Guard against seek overflows */ |
| 2237 | if ((zip->disk_offset_shift > 0) && |
| 2238 | (zip->file_info.disk_offset > (INT64_MAX - zip->disk_offset_shift))) |
| 2239 | return MZ_FORMAT_ERROR; |
| 2240 | |
| 2241 | return mz_stream_seek(zip->stream, zip->file_info.disk_offset + zip->disk_offset_shift, MZ_SEEK_SET); |
| 2242 | } |
| 2243 | |
Nathan Moinvaziri | 9e754e5 | 2022-04-27 10:56:23 -0700 | [diff] [blame] | 2244 | int32_t mz_zip_entry_get_compress_stream(void *handle, void **compress_stream) { |
| 2245 | mz_zip *zip = (mz_zip *)handle; |
| 2246 | if (zip == NULL || compress_stream == NULL) |
| 2247 | return MZ_PARAM_ERROR; |
| 2248 | *compress_stream = zip->compress_stream; |
| 2249 | if (*compress_stream == NULL) |
| 2250 | return MZ_EXIST_ERROR; |
| 2251 | return MZ_OK; |
| 2252 | } |
| 2253 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2254 | int32_t mz_zip_entry_close(void *handle) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 2255 | return mz_zip_entry_close_raw(handle, UINT64_MAX, 0); |
| 2256 | } |
| 2257 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2258 | int32_t mz_zip_entry_close_raw(void *handle, int64_t uncompressed_size, uint32_t crc32) { |
Nathan Moinvaziri | 163352f | 2020-02-08 21:28:23 -0800 | [diff] [blame] | 2259 | mz_zip *zip = (mz_zip *)handle; |
| 2260 | int32_t err = MZ_OK; |
| 2261 | |
| 2262 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
| 2263 | return MZ_PARAM_ERROR; |
| 2264 | |
| 2265 | if (zip->open_mode & MZ_OPEN_MODE_WRITE) |
| 2266 | err = mz_zip_entry_write_close(handle, crc32, UINT64_MAX, uncompressed_size); |
| 2267 | else |
| 2268 | err = mz_zip_entry_read_close(handle, NULL, NULL, NULL); |
| 2269 | |
| 2270 | return err; |
| 2271 | } |
| 2272 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2273 | int32_t mz_zip_entry_is_dir(void *handle) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2274 | mz_zip *zip = (mz_zip *)handle; |
| 2275 | int32_t filename_length = 0; |
| 2276 | |
| 2277 | if (zip == NULL) |
| 2278 | return MZ_PARAM_ERROR; |
| 2279 | if (zip->entry_scanned == 0) |
| 2280 | return MZ_PARAM_ERROR; |
| 2281 | if (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK) |
| 2282 | return MZ_OK; |
| 2283 | |
| 2284 | filename_length = (int32_t)strlen(zip->file_info.filename); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2285 | if (filename_length > 0) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2286 | if ((zip->file_info.filename[filename_length - 1] == '/') || |
| 2287 | (zip->file_info.filename[filename_length - 1] == '\\')) |
| 2288 | return MZ_OK; |
| 2289 | } |
| 2290 | return MZ_EXIST_ERROR; |
| 2291 | } |
| 2292 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2293 | int32_t mz_zip_entry_is_symlink(void *handle) { |
Nathan Moinvaziri | 3249eac | 2019-05-02 21:07:39 -0700 | [diff] [blame] | 2294 | mz_zip *zip = (mz_zip *)handle; |
| 2295 | |
| 2296 | if (zip == NULL) |
| 2297 | return MZ_PARAM_ERROR; |
| 2298 | if (zip->entry_scanned == 0) |
| 2299 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 426543d | 2019-05-07 09:46:25 -0700 | [diff] [blame] | 2300 | if (mz_zip_attrib_is_symlink(zip->file_info.external_fa, zip->file_info.version_madeby) != MZ_OK) |
| 2301 | return MZ_EXIST_ERROR; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2302 | |
Nathan Moinvaziri | a5a1d5d | 2019-05-05 20:13:58 -0700 | [diff] [blame] | 2303 | return MZ_OK; |
Nathan Moinvaziri | 3249eac | 2019-05-02 21:07:39 -0700 | [diff] [blame] | 2304 | } |
| 2305 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2306 | int32_t mz_zip_entry_get_info(void *handle, mz_zip_file **file_info) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2307 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2308 | |
| 2309 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2310 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2311 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2312 | if ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2313 | if (!zip->entry_scanned) |
| 2314 | return MZ_PARAM_ERROR; |
| 2315 | } |
| 2316 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2317 | *file_info = &zip->file_info; |
| 2318 | return MZ_OK; |
| 2319 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2320 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2321 | int32_t mz_zip_entry_get_local_info(void *handle, mz_zip_file **local_file_info) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2322 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2323 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2324 | return MZ_PARAM_ERROR; |
| 2325 | *local_file_info = &zip->local_file_info; |
| 2326 | return MZ_OK; |
| 2327 | } |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2328 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2329 | int32_t mz_zip_entry_set_extrafield(void *handle, const uint8_t *extrafield, uint16_t extrafield_size) { |
Nathan Moinvaziri | 915c513 | 2018-10-26 20:00:52 -0700 | [diff] [blame] | 2330 | mz_zip *zip = (mz_zip *)handle; |
| 2331 | |
| 2332 | if (zip == NULL || mz_zip_entry_is_open(handle) != MZ_OK) |
| 2333 | return MZ_PARAM_ERROR; |
| 2334 | |
| 2335 | zip->file_info.extrafield = extrafield; |
| 2336 | zip->file_info.extrafield_size = extrafield_size; |
| 2337 | return MZ_OK; |
| 2338 | } |
| 2339 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2340 | static int32_t mz_zip_goto_next_entry_int(void *handle) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2341 | mz_zip *zip = (mz_zip *)handle; |
| 2342 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2343 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2344 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2345 | return MZ_PARAM_ERROR; |
| 2346 | |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2347 | zip->entry_scanned = 0; |
| 2348 | |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2349 | mz_stream_set_prop_int64(zip->cd_stream, MZ_STREAM_PROP_DISK_NUMBER, -1); |
Viktor Szakats | 915b82e | 2018-04-24 10:02:39 +0000 | [diff] [blame] | 2350 | |
Nathan Moinvaziri | 79ac338 | 2017-10-23 17:22:36 -0700 | [diff] [blame] | 2351 | err = mz_stream_seek(zip->cd_stream, zip->cd_current_pos, MZ_SEEK_SET); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2352 | if (err == MZ_OK) |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 2353 | err = mz_zip_entry_read_header(zip->cd_stream, 0, &zip->file_info, zip->file_info_stream); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2354 | if (err == MZ_OK) |
| 2355 | zip->entry_scanned = 1; |
| 2356 | return err; |
| 2357 | } |
| 2358 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2359 | int64_t mz_zip_get_entry(void *handle) { |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2360 | mz_zip *zip = (mz_zip *)handle; |
| 2361 | |
| 2362 | if (zip == NULL) |
| 2363 | return MZ_PARAM_ERROR; |
| 2364 | |
| 2365 | return zip->cd_current_pos; |
| 2366 | } |
| 2367 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2368 | int32_t mz_zip_goto_entry(void *handle, int64_t cd_pos) { |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2369 | mz_zip *zip = (mz_zip *)handle; |
| 2370 | |
| 2371 | if (zip == NULL) |
| 2372 | return MZ_PARAM_ERROR; |
| 2373 | |
| 2374 | if (cd_pos < zip->cd_start_pos || cd_pos > zip->cd_start_pos + zip->cd_size) |
| 2375 | return MZ_PARAM_ERROR; |
| 2376 | |
| 2377 | zip->cd_current_pos = cd_pos; |
| 2378 | |
| 2379 | return mz_zip_goto_next_entry_int(handle); |
| 2380 | } |
| 2381 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2382 | int32_t mz_zip_goto_first_entry(void *handle) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2383 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2384 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2385 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2386 | return MZ_PARAM_ERROR; |
| 2387 | |
Nathan Moinvaziri | cda3600 | 2017-10-21 09:37:18 -0700 | [diff] [blame] | 2388 | zip->cd_current_pos = zip->cd_start_pos; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2389 | |
| 2390 | return mz_zip_goto_next_entry_int(handle); |
| 2391 | } |
| 2392 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2393 | int32_t mz_zip_goto_next_entry(void *handle) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2394 | mz_zip *zip = (mz_zip *)handle; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2395 | |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2396 | if (zip == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2397 | return MZ_PARAM_ERROR; |
| 2398 | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2399 | zip->cd_current_pos += (int64_t)MZ_ZIP_SIZE_CD_ITEM + zip->file_info.filename_size + |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2400 | zip->file_info.extrafield_size + zip->file_info.comment_size; |
| 2401 | |
| 2402 | return mz_zip_goto_next_entry_int(handle); |
| 2403 | } |
| 2404 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2405 | int32_t mz_zip_locate_entry(void *handle, const char *filename, uint8_t ignore_case) { |
Nathan Moinvaziri | 5f9e5d3 | 2017-10-20 07:59:39 -0700 | [diff] [blame] | 2406 | mz_zip *zip = (mz_zip *)handle; |
| 2407 | int32_t err = MZ_OK; |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2408 | int32_t result = 0; |
| 2409 | |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2410 | if (zip == NULL || filename == NULL) |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2411 | return MZ_PARAM_ERROR; |
| 2412 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2413 | /* If we are already on the current entry, no need to search */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2414 | if ((zip->entry_scanned) && (zip->file_info.filename != NULL)) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2415 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
Nathan Moinvaziri | 77687f3 | 2018-08-09 16:29:26 -0700 | [diff] [blame] | 2416 | if (result == 0) |
| 2417 | return MZ_OK; |
| 2418 | } |
| 2419 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2420 | /* Search all entries starting at the first */ |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2421 | err = mz_zip_goto_first_entry(handle); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2422 | while (err == MZ_OK) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2423 | result = mz_zip_path_compare(zip->file_info.filename, filename, ignore_case); |
| 2424 | if (result == 0) |
| 2425 | return MZ_OK; |
| 2426 | |
| 2427 | err = mz_zip_goto_next_entry(handle); |
| 2428 | } |
| 2429 | |
| 2430 | return err; |
| 2431 | } |
| 2432 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2433 | int32_t mz_zip_locate_first_entry(void *handle, void *userdata, mz_zip_locate_entry_cb cb) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2434 | mz_zip *zip = (mz_zip *)handle; |
| 2435 | int32_t err = MZ_OK; |
| 2436 | int32_t result = 0; |
| 2437 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2438 | /* Search first entry looking for match */ |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2439 | err = mz_zip_goto_first_entry(handle); |
| 2440 | if (err != MZ_OK) |
| 2441 | return err; |
| 2442 | |
| 2443 | result = cb(handle, userdata, &zip->file_info); |
| 2444 | if (result == 0) |
| 2445 | return MZ_OK; |
| 2446 | |
| 2447 | return mz_zip_locate_next_entry(handle, userdata, cb); |
| 2448 | } |
| 2449 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2450 | int32_t mz_zip_locate_next_entry(void *handle, void *userdata, mz_zip_locate_entry_cb cb) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2451 | mz_zip *zip = (mz_zip *)handle; |
| 2452 | int32_t err = MZ_OK; |
| 2453 | int32_t result = 0; |
| 2454 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2455 | /* Search next entries looking for match */ |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2456 | err = mz_zip_goto_next_entry(handle); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2457 | while (err == MZ_OK) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2458 | result = cb(handle, userdata, &zip->file_info); |
Nathan Moinvaziri | 8f67ff9 | 2017-10-17 23:22:29 -0700 | [diff] [blame] | 2459 | if (result == 0) |
| 2460 | return MZ_OK; |
| 2461 | |
| 2462 | err = mz_zip_goto_next_entry(handle); |
| 2463 | } |
| 2464 | |
| 2465 | return err; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2466 | } |
| 2467 | |
| 2468 | /***************************************************************************/ |
| 2469 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2470 | int32_t mz_zip_attrib_is_dir(uint32_t attrib, int32_t version_madeby) { |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2471 | uint32_t posix_attrib = 0; |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2472 | uint8_t system = MZ_HOST_SYSTEM(version_madeby); |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2473 | int32_t err = MZ_OK; |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2474 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2475 | err = mz_zip_attrib_convert(system, attrib, MZ_HOST_SYSTEM_UNIX, &posix_attrib); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2476 | if (err == MZ_OK) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2477 | if ((posix_attrib & 0170000) == 0040000) /* S_ISDIR */ |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2478 | return MZ_OK; |
| 2479 | } |
| 2480 | |
| 2481 | return MZ_EXIST_ERROR; |
| 2482 | } |
| 2483 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2484 | int32_t mz_zip_attrib_is_symlink(uint32_t attrib, int32_t version_madeby) { |
Nathan Moinvaziri | 426543d | 2019-05-07 09:46:25 -0700 | [diff] [blame] | 2485 | uint32_t posix_attrib = 0; |
| 2486 | uint8_t system = MZ_HOST_SYSTEM(version_madeby); |
| 2487 | int32_t err = MZ_OK; |
| 2488 | |
| 2489 | err = mz_zip_attrib_convert(system, attrib, MZ_HOST_SYSTEM_UNIX, &posix_attrib); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2490 | if (err == MZ_OK) { |
Nathan Moinvaziri | 426543d | 2019-05-07 09:46:25 -0700 | [diff] [blame] | 2491 | if ((posix_attrib & 0170000) == 0120000) /* S_ISLNK */ |
| 2492 | return MZ_OK; |
| 2493 | } |
| 2494 | |
| 2495 | return MZ_EXIST_ERROR; |
| 2496 | } |
| 2497 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2498 | int32_t mz_zip_attrib_convert(uint8_t src_sys, uint32_t src_attrib, uint8_t target_sys, uint32_t *target_attrib) { |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2499 | if (target_attrib == NULL) |
| 2500 | return MZ_PARAM_ERROR; |
| 2501 | |
| 2502 | *target_attrib = 0; |
| 2503 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2504 | if ((src_sys == MZ_HOST_SYSTEM_MSDOS) || (src_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) { |
| 2505 | if ((target_sys == MZ_HOST_SYSTEM_MSDOS) || (target_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) { |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2506 | *target_attrib = src_attrib; |
| 2507 | return MZ_OK; |
| 2508 | } |
Cameron Cawley | 28f78ff | 2019-08-06 14:14:14 +0100 | [diff] [blame] | 2509 | if ((target_sys == MZ_HOST_SYSTEM_UNIX) || (target_sys == MZ_HOST_SYSTEM_OSX_DARWIN) || (target_sys == MZ_HOST_SYSTEM_RISCOS)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2510 | return mz_zip_attrib_win32_to_posix(src_attrib, target_attrib); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2511 | } else if ((src_sys == MZ_HOST_SYSTEM_UNIX) || (src_sys == MZ_HOST_SYSTEM_OSX_DARWIN) || (src_sys == MZ_HOST_SYSTEM_RISCOS)) { |
Jeremy Bernstein | 15ebdb7 | 2022-10-05 16:36:34 +0200 | [diff] [blame] | 2512 | /* If high bytes are set, it contains unix specific attributes */ |
| 2513 | if ((src_attrib >> 16) != 0) |
| 2514 | src_attrib >>= 16; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2515 | |
Jeremy Bernstein | 15ebdb7 | 2022-10-05 16:36:34 +0200 | [diff] [blame] | 2516 | if ((target_sys == MZ_HOST_SYSTEM_UNIX) || (target_sys == MZ_HOST_SYSTEM_OSX_DARWIN) || (target_sys == MZ_HOST_SYSTEM_RISCOS)) { |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2517 | *target_attrib = src_attrib; |
| 2518 | return MZ_OK; |
| 2519 | } |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2520 | if ((target_sys == MZ_HOST_SYSTEM_MSDOS) || (target_sys == MZ_HOST_SYSTEM_WINDOWS_NTFS)) |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2521 | return mz_zip_attrib_posix_to_win32(src_attrib, target_attrib); |
| 2522 | } |
| 2523 | |
| 2524 | return MZ_SUPPORT_ERROR; |
| 2525 | } |
| 2526 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2527 | int32_t mz_zip_attrib_posix_to_win32(uint32_t posix_attrib, uint32_t *win32_attrib) { |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2528 | if (win32_attrib == NULL) |
| 2529 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2530 | |
Nathan Moinvaziri | 2bb21d7 | 2018-10-08 21:47:15 -0700 | [diff] [blame] | 2531 | *win32_attrib = 0; |
Nathan Moinvaziri | 32fd805 | 2019-07-04 10:32:02 -0700 | [diff] [blame] | 2532 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2533 | /* S_IWUSR | S_IWGRP | S_IWOTH | S_IXUSR | S_IXGRP | S_IXOTH */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2534 | if ((posix_attrib & 0000333) == 0 && (posix_attrib & 0000444) != 0) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2535 | *win32_attrib |= 0x01; /* FILE_ATTRIBUTE_READONLY */ |
Nathan Moinvaziri | 426543d | 2019-05-07 09:46:25 -0700 | [diff] [blame] | 2536 | /* S_IFLNK */ |
| 2537 | if ((posix_attrib & 0170000) == 0120000) |
| 2538 | *win32_attrib |= 0x400; /* FILE_ATTRIBUTE_REPARSE_POINT */ |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2539 | /* S_IFDIR */ |
Nathan Moinvaziri | 7d94b1f | 2019-05-08 23:41:47 -0700 | [diff] [blame] | 2540 | else if ((posix_attrib & 0170000) == 0040000) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2541 | *win32_attrib |= 0x10; /* FILE_ATTRIBUTE_DIRECTORY */ |
| 2542 | /* S_IFREG */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2543 | else |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2544 | *win32_attrib |= 0x80; /* FILE_ATTRIBUTE_NORMAL */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2545 | |
| 2546 | return MZ_OK; |
| 2547 | } |
| 2548 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2549 | int32_t mz_zip_attrib_win32_to_posix(uint32_t win32_attrib, uint32_t *posix_attrib) { |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2550 | if (posix_attrib == NULL) |
| 2551 | return MZ_PARAM_ERROR; |
| 2552 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2553 | *posix_attrib = 0000444; /* S_IRUSR | S_IRGRP | S_IROTH */ |
| 2554 | /* FILE_ATTRIBUTE_READONLY */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2555 | if ((win32_attrib & 0x01) == 0) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2556 | *posix_attrib |= 0000222; /* S_IWUSR | S_IWGRP | S_IWOTH */ |
Nathan Moinvaziri | 426543d | 2019-05-07 09:46:25 -0700 | [diff] [blame] | 2557 | /* FILE_ATTRIBUTE_REPARSE_POINT */ |
| 2558 | if ((win32_attrib & 0x400) == 0x400) |
| 2559 | *posix_attrib |= 0120000; /* S_IFLNK */ |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2560 | /* FILE_ATTRIBUTE_DIRECTORY */ |
Nathan Moinvaziri | 7d94b1f | 2019-05-08 23:41:47 -0700 | [diff] [blame] | 2561 | else if ((win32_attrib & 0x10) == 0x10) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2562 | *posix_attrib |= 0040111; /* S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2563 | else |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2564 | *posix_attrib |= 0100000; /* S_IFREG */ |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2565 | |
| 2566 | return MZ_OK; |
| 2567 | } |
| 2568 | |
Nathan Moinvaziri | bb3b75b | 2018-05-02 10:48:51 -0700 | [diff] [blame] | 2569 | /***************************************************************************/ |
| 2570 | |
Nathan Moinvaziri | 8f76968 | 2020-12-23 11:26:30 -0800 | [diff] [blame] | 2571 | int32_t mz_zip_extrafield_find(void *stream, uint16_t type, int32_t max_seek, uint16_t *length) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2572 | int32_t err = MZ_OK; |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2573 | uint16_t field_type = 0; |
| 2574 | uint16_t field_length = 0; |
| 2575 | |
Nathan Moinvaziri | 8f76968 | 2020-12-23 11:26:30 -0800 | [diff] [blame] | 2576 | if (max_seek < 4) |
| 2577 | return MZ_EXIST_ERROR; |
| 2578 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2579 | do { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2580 | err = mz_stream_read_uint16(stream, &field_type); |
| 2581 | if (err == MZ_OK) |
| 2582 | err = mz_stream_read_uint16(stream, &field_length); |
| 2583 | if (err != MZ_OK) |
| 2584 | break; |
| 2585 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2586 | if (type == field_type) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2587 | if (length != NULL) |
| 2588 | *length = field_length; |
| 2589 | return MZ_OK; |
| 2590 | } |
| 2591 | |
Nathan Moinvaziri | 8f76968 | 2020-12-23 11:26:30 -0800 | [diff] [blame] | 2592 | max_seek -= field_length - 4; |
| 2593 | if (max_seek < 0) |
| 2594 | return MZ_EXIST_ERROR; |
| 2595 | |
Nathan Moinvaziri | 0dfcdf9 | 2018-11-07 20:33:47 -0800 | [diff] [blame] | 2596 | err = mz_stream_seek(stream, field_length, MZ_SEEK_CUR); |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2597 | } while (err == MZ_OK); |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2598 | |
| 2599 | return MZ_EXIST_ERROR; |
| 2600 | } |
| 2601 | |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2602 | int32_t mz_zip_extrafield_contains(const uint8_t *extrafield, int32_t extrafield_size, |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2603 | uint16_t type, uint16_t *length) { |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2604 | void *file_extra_stream = NULL; |
| 2605 | int32_t err = MZ_OK; |
| 2606 | |
| 2607 | if (extrafield == NULL || extrafield_size == 0) |
| 2608 | return MZ_PARAM_ERROR; |
| 2609 | |
| 2610 | mz_stream_mem_create(&file_extra_stream); |
| 2611 | mz_stream_mem_set_buffer(file_extra_stream, (void *)extrafield, extrafield_size); |
| 2612 | |
Nathan Moinvaziri | 8f76968 | 2020-12-23 11:26:30 -0800 | [diff] [blame] | 2613 | err = mz_zip_extrafield_find(file_extra_stream, type, extrafield_size, length); |
Nathan Moinvaziri | ba1db16 | 2018-11-23 10:07:35 -0800 | [diff] [blame] | 2614 | |
| 2615 | mz_stream_mem_delete(&file_extra_stream); |
| 2616 | |
| 2617 | return err; |
| 2618 | } |
| 2619 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2620 | int32_t mz_zip_extrafield_read(void *stream, uint16_t *type, uint16_t *length) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2621 | int32_t err = MZ_OK; |
| 2622 | if (type == NULL || length == NULL) |
| 2623 | return MZ_PARAM_ERROR; |
| 2624 | err = mz_stream_read_uint16(stream, type); |
| 2625 | if (err == MZ_OK) |
| 2626 | err = mz_stream_read_uint16(stream, length); |
| 2627 | return err; |
| 2628 | } |
| 2629 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2630 | int32_t mz_zip_extrafield_write(void *stream, uint16_t type, uint16_t length) { |
Nathan Moinvaziri | e1f68fc | 2018-10-23 09:04:04 -0700 | [diff] [blame] | 2631 | int32_t err = MZ_OK; |
| 2632 | err = mz_stream_write_uint16(stream, type); |
| 2633 | if (err == MZ_OK) |
| 2634 | err = mz_stream_write_uint16(stream, length); |
| 2635 | return err; |
| 2636 | } |
| 2637 | |
| 2638 | /***************************************************************************/ |
| 2639 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2640 | static int32_t mz_zip_invalid_date(const struct tm *ptm) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2641 | #define datevalue_in_range(min, max, value) ((min) <= (value) && (value) <= (max)) |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2642 | return (!datevalue_in_range(0, 127 + 80, ptm->tm_year) || /* 1980-based year, allow 80 extra */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2643 | !datevalue_in_range(0, 11, ptm->tm_mon) || |
| 2644 | !datevalue_in_range(1, 31, ptm->tm_mday) || |
| 2645 | !datevalue_in_range(0, 23, ptm->tm_hour) || |
| 2646 | !datevalue_in_range(0, 59, ptm->tm_min) || |
| 2647 | !datevalue_in_range(0, 59, ptm->tm_sec)); |
| 2648 | #undef datevalue_in_range |
| 2649 | } |
| 2650 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2651 | static void mz_zip_dosdate_to_raw_tm(uint64_t dos_date, struct tm *ptm) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2652 | uint64_t date = (uint64_t)(dos_date >> 16); |
| 2653 | |
Nathan Moinvaziri | 1d6d183 | 2018-11-10 09:03:55 -0800 | [diff] [blame] | 2654 | ptm->tm_mday = (uint16_t)(date & 0x1f); |
| 2655 | ptm->tm_mon = (uint16_t)(((date & 0x1E0) / 0x20) - 1); |
| 2656 | ptm->tm_year = (uint16_t)(((date & 0x0FE00) / 0x0200) + 80); |
| 2657 | ptm->tm_hour = (uint16_t)((dos_date & 0xF800) / 0x800); |
| 2658 | ptm->tm_min = (uint16_t)((dos_date & 0x7E0) / 0x20); |
| 2659 | ptm->tm_sec = (uint16_t)(2 * (dos_date & 0x1f)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2660 | ptm->tm_isdst = -1; |
| 2661 | } |
| 2662 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2663 | int32_t mz_zip_dosdate_to_tm(uint64_t dos_date, struct tm *ptm) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2664 | if (ptm == NULL) |
| 2665 | return MZ_PARAM_ERROR; |
| 2666 | |
| 2667 | mz_zip_dosdate_to_raw_tm(dos_date, ptm); |
| 2668 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2669 | if (mz_zip_invalid_date(ptm)) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2670 | /* Invalid date stored, so don't return it */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2671 | memset(ptm, 0, sizeof(struct tm)); |
| 2672 | return MZ_FORMAT_ERROR; |
| 2673 | } |
| 2674 | return MZ_OK; |
| 2675 | } |
| 2676 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2677 | time_t mz_zip_dosdate_to_time_t(uint64_t dos_date) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2678 | struct tm ptm; |
| 2679 | mz_zip_dosdate_to_raw_tm(dos_date, &ptm); |
| 2680 | return mktime(&ptm); |
| 2681 | } |
| 2682 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2683 | int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm) { |
Nathan Moinvaziri | cd3e9e1 | 2019-04-28 10:22:49 -0700 | [diff] [blame] | 2684 | struct tm ltm; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2685 | if (ptm == NULL) |
| 2686 | return MZ_PARAM_ERROR; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2687 | if (localtime_r(&unix_time, <m) == NULL) { /* Returns a 1900-based year */ |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2688 | /* Invalid date stored, so don't return it */ |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2689 | memset(ptm, 0, sizeof(struct tm)); |
Nathan Moinvaziri | 17fcdcd | 2017-10-26 08:13:13 -0700 | [diff] [blame] | 2690 | return MZ_INTERNAL_ERROR; |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2691 | } |
Nathan Moinvaziri | cd3e9e1 | 2019-04-28 10:22:49 -0700 | [diff] [blame] | 2692 | memcpy(ptm, <m, sizeof(struct tm)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2693 | return MZ_OK; |
| 2694 | } |
| 2695 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2696 | uint32_t mz_zip_time_t_to_dos_date(time_t unix_time) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2697 | struct tm ptm; |
| 2698 | mz_zip_time_t_to_tm(unix_time, &ptm); |
| 2699 | return mz_zip_tm_to_dosdate((const struct tm *)&ptm); |
| 2700 | } |
| 2701 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2702 | uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm) { |
Nathan Moinvaziri | e33916b | 2018-05-01 13:45:08 -0700 | [diff] [blame] | 2703 | struct tm fixed_tm; |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2704 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2705 | /* Years supported: */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2706 | |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2707 | /* [00, 79] (assumed to be between 2000 and 2079) */ |
| 2708 | /* [80, 207] (assumed to be between 1980 and 2107, typical output of old */ |
| 2709 | /* software that does 'year-1900' to get a double digit year) */ |
| 2710 | /* [1980, 2107] (due to format limitations, only years 1980-2107 can be stored.) */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2711 | |
| 2712 | memcpy(&fixed_tm, ptm, sizeof(struct tm)); |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2713 | if (fixed_tm.tm_year >= 1980) /* range [1980, 2107] */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2714 | fixed_tm.tm_year -= 1980; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2715 | else if (fixed_tm.tm_year >= 80) /* range [80, 207] */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2716 | fixed_tm.tm_year -= 80; |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2717 | else /* range [00, 79] */ |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2718 | fixed_tm.tm_year += 20; |
| 2719 | |
Viktor Szakats | ce26dba | 2018-04-22 19:30:34 +0000 | [diff] [blame] | 2720 | if (mz_zip_invalid_date(&fixed_tm)) |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2721 | return 0; |
| 2722 | |
Anand K Mistry | 57b65f8 | 2018-11-09 10:52:19 +1100 | [diff] [blame] | 2723 | return (((uint32_t)fixed_tm.tm_mday + (32 * ((uint32_t)fixed_tm.tm_mon + 1)) + (512 * (uint32_t)fixed_tm.tm_year)) << 16) | |
Nathan Moinvaziri | 904c408 | 2018-10-08 23:31:21 -0700 | [diff] [blame] | 2724 | (((uint32_t)fixed_tm.tm_sec / 2) + (32 * (uint32_t)fixed_tm.tm_min) + (2048 * (uint32_t)fixed_tm.tm_hour)); |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2725 | } |
| 2726 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2727 | int32_t mz_zip_ntfs_to_unix_time(uint64_t ntfs_time, time_t *unix_time) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2728 | *unix_time = (time_t)((ntfs_time - 116444736000000000LL) / 10000000); |
| 2729 | return MZ_OK; |
| 2730 | } |
| 2731 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2732 | int32_t mz_zip_unix_to_ntfs_time(time_t unix_time, uint64_t *ntfs_time) { |
Nathan Moinvaziri | 9eab88e | 2017-10-22 14:32:37 -0700 | [diff] [blame] | 2733 | *ntfs_time = ((uint64_t)unix_time * 10000000) + 116444736000000000LL; |
| 2734 | return MZ_OK; |
| 2735 | } |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2736 | |
Nathan Moinvaziri | 4b8e4b3 | 2018-08-20 09:06:23 -0700 | [diff] [blame] | 2737 | /***************************************************************************/ |
| 2738 | |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2739 | int32_t mz_zip_path_compare(const char *path1, const char *path2, uint8_t ignore_case) { |
| 2740 | do { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2741 | if ((*path1 == '\\' && *path2 == '/') || |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2742 | (*path2 == '\\' && *path1 == '/')) { |
Nathan Moinvaziri | b16ab56 | 2018-11-20 16:56:21 -0800 | [diff] [blame] | 2743 | /* Ignore comparison of path slashes */ |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2744 | } else if (ignore_case) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2745 | if (tolower(*path1) != tolower(*path2)) |
| 2746 | break; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2747 | } else if (*path1 != *path2) { |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2748 | break; |
| 2749 | } |
| 2750 | |
| 2751 | path1 += 1; |
| 2752 | path2 += 1; |
Nathan Moinvaziri | dc6962b | 2020-06-14 15:19:14 -0700 | [diff] [blame] | 2753 | } while (*path1 != 0 && *path2 != 0); |
Nathan Moinvaziri | 9a170d4 | 2018-08-13 23:07:42 -0700 | [diff] [blame] | 2754 | |
| 2755 | if (ignore_case) |
| 2756 | return (int32_t)(tolower(*path1) - tolower(*path2)); |
| 2757 | |
| 2758 | return (int32_t)(*path1 - *path2); |
| 2759 | } |
| 2760 | |
| 2761 | /***************************************************************************/ |
Nathan Moinvaziri | c4668ed | 2020-10-25 11:56:19 -0700 | [diff] [blame] | 2762 | |
| 2763 | const char* mz_zip_get_compression_method_string(int32_t compression_method) |
| 2764 | { |
| 2765 | const char *method = "?"; |
Nathan Moinvaziri | 5cd2879 | 2020-10-25 12:50:12 -0700 | [diff] [blame] | 2766 | switch (compression_method) { |
Nathan Moinvaziri | c4668ed | 2020-10-25 11:56:19 -0700 | [diff] [blame] | 2767 | case MZ_COMPRESS_METHOD_STORE: |
| 2768 | method = "stored"; |
| 2769 | break; |
| 2770 | case MZ_COMPRESS_METHOD_DEFLATE: |
| 2771 | method = "deflate"; |
| 2772 | break; |
| 2773 | case MZ_COMPRESS_METHOD_BZIP2: |
| 2774 | method = "bzip2"; |
| 2775 | break; |
| 2776 | case MZ_COMPRESS_METHOD_LZMA: |
| 2777 | method = "lzma"; |
| 2778 | break; |
| 2779 | case MZ_COMPRESS_METHOD_XZ: |
| 2780 | method = "xz"; |
| 2781 | break; |
| 2782 | case MZ_COMPRESS_METHOD_ZSTD: |
| 2783 | method = "zstd"; |
| 2784 | break; |
| 2785 | } |
| 2786 | return method; |
| 2787 | } |
| 2788 | |
| 2789 | /***************************************************************************/ |