Overview
| Comment: | OFZIPArchive: Fix ZIP64 support |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7fed52573a5914d038e70b18c15d88d9 |
| User & Date: | js on 2016-10-08 15:57:50 |
| Other Links: | manifest | tags |
Context
|
2016-10-08
| ||
| 15:57 | OFZIPArchive: Do not compare minimum version check-in: f013a6748a user: js tags: trunk | |
| 15:57 | OFZIPArchive: Fix ZIP64 support check-in: 7fed52573a user: js tags: trunk | |
| 15:57 | OFStdIOStream: Add -[columns] and -[rows] check-in: b317a4d56d user: js tags: trunk | |
Changes
Modified src/OFZIPArchive.m from [c12f6e9a97] to [6a44e68a99].
| ︙ | ︙ | |||
233 234 235 236 237 238 239 | encoding: OF_STRING_ENCODING_CODEPAGE_437] copy]; if (_diskNumber == 0xFFFF || _centralDirectoryDisk == 0xFFFF || _centralDirectoryEntriesInDisk == 0xFFFF || _centralDirectoryEntries == 0xFFFF || _centralDirectorySize == 0xFFFFFFFF || | | | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 |
encoding: OF_STRING_ENCODING_CODEPAGE_437] copy];
if (_diskNumber == 0xFFFF ||
_centralDirectoryDisk == 0xFFFF ||
_centralDirectoryEntriesInDisk == 0xFFFF ||
_centralDirectoryEntries == 0xFFFF ||
_centralDirectorySize == 0xFFFFFFFF ||
_centralDirectoryOffset == 0xFFFFFFFF) {
int64_t offset64;
uint64_t size;
seekOrThrowInvalidFormat(_stream, offset - 20, SEEK_END);
if ([_stream readLittleEndianInt32] != 0x07064B50) {
objc_autoreleasePoolPop(pool);
|
| ︙ | ︙ |
Modified src/OFZIPArchiveEntry.m from [4e05d700c6] to [f2a2634cf6].
| ︙ | ︙ | |||
201 202 203 204 205 206 207 |
if (ZIP64 != NULL) {
if (_uncompressedSize == 0xFFFFFFFF)
_uncompressedSize = of_zip_archive_read_field64(
&ZIP64, &ZIP64Size);
if (_compressedSize == 0xFFFFFFFF)
_compressedSize = of_zip_archive_read_field64(
&ZIP64, &ZIP64Size);
| | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 |
if (ZIP64 != NULL) {
if (_uncompressedSize == 0xFFFFFFFF)
_uncompressedSize = of_zip_archive_read_field64(
&ZIP64, &ZIP64Size);
if (_compressedSize == 0xFFFFFFFF)
_compressedSize = of_zip_archive_read_field64(
&ZIP64, &ZIP64Size);
if (_localFileHeaderOffset == 0xFFFFFFFF)
_localFileHeaderOffset =
of_zip_archive_read_field64(&ZIP64,
&ZIP64Size);
if (_startDiskNumber == 0xFFFF)
_startDiskNumber = of_zip_archive_read_field32(
&ZIP64, &ZIP64Size);
|
| ︙ | ︙ |