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