| ︙ | | |
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
-
+
-
+
-
+
|
@interface OFZIPArchive ()
- (void)of_readZIPInfo;
- (void)of_readEntries;
- (void)of_closeLastReturnedStream;
- (void)of_writeCentralDirectory;
@end
@interface OFZIPArchive_LocalFileHeader: OFObject
@interface OFZIPArchiveLocalFileHeader: OFObject
{
@public
uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFData *_extraField;
}
- (instancetype)initWithStream: (OFStream *)stream;
- (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
@end
@interface OFZIPArchive_FileReadStream: OFStream
@interface OFZIPArchiveFileReadStream: OFStream
{
OFStream *_stream, *_decompressedStream;
OFZIPArchiveEntry *_entry;
uint64_t _toRead;
uint32_t _CRC32;
bool _atEndOfStream;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry;
@end
@interface OFZIPArchive_FileWriteStream: OFStream
@interface OFZIPArchiveFileWriteStream: OFStream
{
OFStream *_stream;
uint32_t _CRC32;
@public
int64_t _bytesWritten;
OFMutableZIPArchiveEntry *_entry;
}
|
| ︙ | | |
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
-
-
-
+
+
+
|
- (void)of_closeLastReturnedStream
{
[_lastReturnedStream close];
if ((_mode == OF_ZIP_ARCHIVE_MODE_WRITE ||
_mode == OF_ZIP_ARCHIVE_MODE_APPEND) &&
[_lastReturnedStream isKindOfClass:
[OFZIPArchive_FileWriteStream class]]) {
OFZIPArchive_FileWriteStream *stream =
(OFZIPArchive_FileWriteStream *)_lastReturnedStream;
[OFZIPArchiveFileWriteStream class]]) {
OFZIPArchiveFileWriteStream *stream =
(OFZIPArchiveFileWriteStream *)_lastReturnedStream;
if (INT64_MAX - _offset < stream->_bytesWritten)
@throw [OFOutOfRangeException exception];
_offset += stream->_bytesWritten;
if (stream->_entry != nil) {
|
| ︙ | | |
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
|
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
|
-
+
-
+
-
+
|
_lastReturnedStream = nil;
}
- (OFStream *)streamForReadingFile: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
OFZIPArchiveEntry *entry;
OFZIPArchive_LocalFileHeader *localFileHeader;
OFZIPArchiveLocalFileHeader *localFileHeader;
int64_t offset64;
if (_mode != OF_ZIP_ARCHIVE_MODE_READ)
@throw [OFInvalidArgumentException exception];
if ((entry = [_pathToEntryMap objectForKey: path]) == nil)
@throw [OFOpenItemFailedException exceptionWithPath: path
mode: @"r"
errNo: ENOENT];
[self of_closeLastReturnedStream];
offset64 = entry.of_localFileHeaderOffset;
if (offset64 < 0 || (of_offset_t)offset64 != offset64)
@throw [OFOutOfRangeException exception];
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
(of_offset_t)offset64, SEEK_SET);
localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
localFileHeader = [[[OFZIPArchiveLocalFileHeader alloc]
initWithStream: _stream] autorelease];
if (![localFileHeader matchesEntry: entry])
@throw [OFInvalidFormatException exception];
if ((localFileHeader->_minVersionNeeded & 0xFF) > 45) {
OFString *version = [OFString stringWithFormat: @"%u.%u",
(localFileHeader->_minVersionNeeded & 0xFF) / 10,
(localFileHeader->_minVersionNeeded & 0xFF) % 10];
@throw [OFUnsupportedVersionException
exceptionWithVersion: version];
}
_lastReturnedStream = [[OFZIPArchive_FileReadStream alloc]
_lastReturnedStream = [[OFZIPArchiveFileReadStream alloc]
of_initWithStream: _stream
entry: entry];
objc_autoreleasePoolPop(pool);
return [[_lastReturnedStream retain] autorelease];
}
|
| ︙ | | |
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
|
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
|
-
+
|
offsetAdd += extraFieldLength;
if (INT64_MAX - _offset < offsetAdd)
@throw [OFOutOfRangeException exception];
_offset += offsetAdd;
_lastReturnedStream = [[OFZIPArchive_FileWriteStream alloc]
_lastReturnedStream = [[OFZIPArchiveFileWriteStream alloc]
initWithStream: _stream
entry: entry];
objc_autoreleasePoolPop(pool);
return [[_lastReturnedStream retain] autorelease];
}
|
| ︙ | | |
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
|
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
|
-
+
|
[self of_writeCentralDirectory];
[_stream release];
_stream = nil;
}
@end
@implementation OFZIPArchive_LocalFileHeader
@implementation OFZIPArchiveLocalFileHeader
- (instancetype)initWithStream: (OFStream *)stream
{
self = [super init];
@try {
void *pool = objc_autoreleasePoolPush();
OFMutableData *extraField = nil;
|
| ︙ | | |
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
|
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
|
-
+
|
if (![_fileName isEqual: entry.fileName])
return false;
return true;
}
@end
@implementation OFZIPArchive_FileReadStream
@implementation OFZIPArchiveFileReadStream
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry
{
self = [super init];
@try {
_stream = [stream retain];
|
| ︙ | | |
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
|
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
|
-
+
|
[_decompressedStream release];
_decompressedStream = nil;
[super close];
}
@end
@implementation OFZIPArchive_FileWriteStream
@implementation OFZIPArchiveFileWriteStream
- (instancetype)initWithStream: (OFStream *)stream
entry: (OFMutableZIPArchiveEntry *)entry
{
self = [super init];
_stream = [stream retain];
_entry = [entry retain];
|
| ︙ | | |