ObjFW  Check-in [f013a6748a]

Overview
Comment:OFZIPArchive: Do not compare minimum version

The minimum version in the central directory is the minimum version
required to parse the central directory entry, while the minimum version
in the local header is the minimum version required to extract the file.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f013a6748a5266760f906b5704b46657e71a98dcf80b4085121b6e62d3971737
User & Date: js on 2016-10-08 15:57:52
Other Links: manifest | tags
Context
2016-10-08
15:57
ObjFW.h: Add missing import check-in: 40abd66d5e user: js tags: trunk
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
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFZIPArchive.m from [6a44e68a99] to [1422bca77d].

︙︙
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449

	[_extraField release];

	[super dealloc];
}

- (bool)matchesEntry: (OFZIPArchiveEntry*)entry
{
	if (_minVersionNeeded != [entry minVersionNeeded] ||
	    _compressionMethod != [entry compressionMethod] ||
	    _lastModifiedFileTime != [entry OF_lastModifiedFileTime] ||
	    _lastModifiedFileDate != [entry OF_lastModifiedFileDate])
		return false;

	if (!(_generalPurposeBitFlag & (1 << 3)))
		if (_CRC32 != [entry CRC32] ||
		    _compressedSize != [entry compressedSize] ||








<
|








434
435
436
437
438
439
440

441
442
443
444
445
446
447
448

	[_extraField release];

	[super dealloc];
}

- (bool)matchesEntry: (OFZIPArchiveEntry*)entry
{

	if (_compressionMethod != [entry compressionMethod] ||
	    _lastModifiedFileTime != [entry OF_lastModifiedFileTime] ||
	    _lastModifiedFileDate != [entry OF_lastModifiedFileDate])
		return false;

	if (!(_generalPurposeBitFlag & (1 << 3)))
		if (_CRC32 != [entry CRC32] ||
		    _compressedSize != [entry compressedSize] ||
︙︙