1
2
3
4
5
6
7
8
9
|
1
2
3
4
5
6
7
8
9
|
-
+
|
/*
* Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im>
*
* All rights reserved.
*
* This file is part of ObjFW. It may be distributed under the terms of the
* Q Public License 1.0, which can be found in the file LICENSE.QPL included in
* the packaging of this file.
*
|
| ︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
-
+
+
+
-
-
-
+
-
|
#include "config.h"
#include <errno.h>
#import "OFZIPArchive.h"
#import "OFZIPArchiveEntry.h"
#import "OFZIPArchiveEntry+Private.h"
#import "OFArchiveURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFArray.h"
#import "OFCRC32.h"
#import "OFData.h"
#import "OFDictionary.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFInflate64Stream.h"
#import "OFInflateStream.h"
#import "OFSeekableStream.h"
#import "OFStream.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFChecksumMismatchException.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFOpenItemFailedException.h"
#import "OFOutOfRangeException.h"
#import "OFSeekFailedException.h"
#import "OFTruncatedDataException.h"
#import "OFUnsupportedVersionException.h"
#import "OFWriteFailedException.h"
/*
* FIXME: Current limitations:
* TODO: Current limitations:
* - Split archives are not supported.
* - Encrypted files cannot be read.
*/
enum {
modeRead,
modeWrite,
modeAppend
|
| ︙ | | |
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
+
-
+
-
+
+
-
+
+
+
|
- (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
@end
OF_DIRECT_MEMBERS
@interface OFZIPArchiveFileReadStream: OFStream
{
OFZIPArchive *_archive;
OFZIPArchiveEntryCompressionMethod _compressionMethod;
OFStream *_stream, *_decompressedStream;
OF_KINDOF(OFStream *) _decompressedStream;
OFZIPArchiveEntry *_entry;
unsigned long long _toRead;
uint32_t _CRC32;
bool _atEndOfStream;
}
- (instancetype)of_initWithArchive: (OFZIPArchive *)archive
stream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry;
@end
OF_DIRECT_MEMBERS
@interface OFZIPArchiveFileWriteStream: OFStream
{
OFZIPArchive *_archive;
OFStream *_stream;
OF_KINDOF(OFStream *) _stream;
uint32_t _CRC32;
OFStreamOffset _CRC32Offset, _size64Offset;
@public
unsigned long long _bytesWritten;
OFMutableZIPArchiveEntry *_entry;
}
- (instancetype)of_initWithArchive: (OFZIPArchive *)archive
stream: (OFStream *)stream
entry: (OFMutableZIPArchiveEntry *)entry;
entry: (OFMutableZIPArchiveEntry *)entry
CRC32Offset: (OFStreamOffset)CRC32Offset
size64Offset: (OFStreamOffset)size64Offset;
@end
uint32_t
OFZIPArchiveReadField32(const uint8_t **data, uint16_t *size)
{
uint32_t field = 0;
|
| ︙ | | |
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+
|
*data += 8;
*size -= 8;
return field;
}
@implementation OFZIPArchive
@synthesize delegate = _delegate, archiveComment = _archiveComment;
static void
seekOrThrowInvalidFormat(OFSeekableStream *stream,
seekOrThrowInvalidFormat(OFZIPArchive *archive, const uint32_t *diskNumber,
OFStreamOffset offset, OFSeekWhence whence)
{
if (diskNumber != NULL && *diskNumber != archive->_diskNumber) {
OFStream *oldStream = archive->_stream;
OFSeekableStream *stream;
if (archive->_mode != modeRead ||
*diskNumber > archive->_lastDiskNumber)
@throw [OFInvalidFormatException exception];
stream = [archive->_delegate archive: archive
wantsPartNumbered: *diskNumber
lastPartNumber: archive->_lastDiskNumber];
if (stream == nil)
@throw [OFInvalidFormatException exception];
archive->_diskNumber = *diskNumber;
archive->_stream = [stream retain];
[oldStream release];
}
@try {
[stream seekToOffset: offset whence: whence];
[archive->_stream seekToOffset: offset whence: whence];
} @catch (OFSeekFailedException *e) {
if (e.errNo == EINVAL)
@throw [OFInvalidFormatException exception];
@throw e;
}
}
@implementation OFZIPArchive
@synthesize archiveComment = _archiveComment;
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
return [[[self alloc] initWithURI: URI mode: mode] autorelease];
return [[[self alloc] initWithIRI: IRI mode: mode] autorelease];
}
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI
{
return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, URI);
return OFArchiveIRIHandlerIRIForFileInArchive(@"zip", path, IRI);
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
|
| ︙ | | |
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
-
+
-
+
-
+
-
+
|
[self of_readZIPInfo];
[self of_readEntries];
}
if (_mode == modeAppend) {
_offset = _centralDirectoryOffset;
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
seekOrThrowInvalidFormat(self, NULL,
(OFStreamOffset)_offset, OFSeekSet);
}
} @catch (id e) {
/*
* If we are in write or append mode, we do not want -[close]
* to write anything to it on error - after all, it might not
* be a ZIP file which we would destroy otherwise.
*/
[_stream release];
_stream = nil;
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFStream *stream;
@try {
if ([mode isEqual: @"a"])
stream = [OFURIHandler openItemAtURI: URI mode: @"r+"];
stream = [OFIRIHandler openItemAtIRI: IRI mode: @"r+"];
else
stream = [OFURIHandler openItemAtURI: URI mode: mode];
stream = [OFIRIHandler openItemAtIRI: IRI mode: mode];
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithStream: stream mode: mode];
|
| ︙ | | |
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
|
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
|
-
-
+
-
+
-
+
+
-
-
+
-
+
+
+
+
+
-
+
-
+
+
+
|
{
void *pool = objc_autoreleasePoolPush();
uint16_t commentLength;
OFStreamOffset offset = -22;
bool valid = false;
do {
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
offset, OFSeekEnd);
seekOrThrowInvalidFormat(self, NULL, offset, OFSeekEnd);
if ([_stream readLittleEndianInt32] == 0x06054B50) {
valid = true;
break;
}
} while (--offset >= -65557);
if (!valid)
@throw [OFInvalidFormatException exception];
_diskNumber = [_stream readLittleEndianInt16];
_diskNumber = _lastDiskNumber = [_stream readLittleEndianInt16];
_centralDirectoryDisk = [_stream readLittleEndianInt16];
_centralDirectoryEntriesInDisk = [_stream readLittleEndianInt16];
_centralDirectoryEntries = [_stream readLittleEndianInt16];
_centralDirectorySize = [_stream readLittleEndianInt32];
_centralDirectoryOffset = [_stream readLittleEndianInt32];
commentLength = [_stream readLittleEndianInt16];
_archiveComment = [[_stream
readStringWithLength: commentLength
encoding: OFStringEncodingCodepage437] copy];
if (_diskNumber == 0xFFFF ||
if (_lastDiskNumber == 0xFFFF ||
_centralDirectoryDisk == 0xFFFF ||
_centralDirectoryEntriesInDisk == 0xFFFF ||
_centralDirectoryEntries == 0xFFFF ||
_centralDirectorySize == 0xFFFFFFFF ||
_centralDirectoryOffset == 0xFFFFFFFF) {
uint32_t diskNumber;
int64_t offset64;
uint64_t size;
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
offset - 20, OFSeekEnd);
seekOrThrowInvalidFormat(self, NULL, offset - 20, OFSeekEnd);
if ([_stream readLittleEndianInt32] != 0x07064B50) {
objc_autoreleasePoolPop(pool);
return;
}
/*
* FIXME: Handle number of the disk containing ZIP64 end of
* central directory record.
*/
[_stream readLittleEndianInt32];
diskNumber = [_stream readLittleEndianInt32];
offset64 = [_stream readLittleEndianInt64];
_lastDiskNumber = [_stream readLittleEndianInt32];
if (_lastDiskNumber == 0)
@throw [OFInvalidFormatException exception];
_lastDiskNumber--;
if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
@throw [OFOutOfRangeException exception];
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
seekOrThrowInvalidFormat(self, &diskNumber,
(OFStreamOffset)offset64, OFSeekSet);
if ([_stream readLittleEndianInt32] != 0x06064B50)
@throw [OFInvalidFormatException exception];
size = [_stream readLittleEndianInt64];
if (size < 44)
@throw [OFInvalidFormatException exception];
/* version made by */
[_stream readLittleEndianInt16];
/* version needed to extract */
[_stream readLittleEndianInt16];
_diskNumber = [_stream readLittleEndianInt32];
if ([_stream readLittleEndianInt32] != _diskNumber)
@throw [OFInvalidFormatException exception];
_centralDirectoryDisk = [_stream readLittleEndianInt32];
_centralDirectoryEntriesInDisk =
[_stream readLittleEndianInt64];
_centralDirectoryEntries = [_stream readLittleEndianInt64];
_centralDirectorySize = [_stream readLittleEndianInt64];
_centralDirectoryOffset = [_stream readLittleEndianInt64];
|
| ︙ | | |
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
|
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
{
void *pool = objc_autoreleasePoolPush();
if (_centralDirectoryOffset < 0 ||
(OFStreamOffset)_centralDirectoryOffset != _centralDirectoryOffset)
@throw [OFOutOfRangeException exception];
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
seekOrThrowInvalidFormat(self, &_centralDirectoryDisk,
(OFStreamOffset)_centralDirectoryOffset, OFSeekSet);
for (size_t i = 0; i < _centralDirectoryEntries; i++) {
OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
OFZIPArchiveEntry *entry;
char buffer;
/*
* The stream might have 0 bytes left to read, but might not
* realize that before a read is attempted, where it will then
* return a length of 0. But OFZIPArchiveEntry expects to be
* able to read the entire entry and will then throw an
* OFTruncatedDataException. Therefore, try to peek one byte to
* make sure the stream realizes that it's at the end.
*/
if ([_stream readIntoBuffer: &buffer length: 1] == 1)
[_stream unreadFromBuffer: &buffer length: 1];
if ([_stream isAtEndOfStream]) {
OFStream *oldStream = _stream;
OFSeekableStream *stream;
if (_diskNumber >= _lastDiskNumber)
@throw [OFTruncatedDataException exception];
stream = [_delegate archive: self
wantsPartNumbered: _diskNumber + 1
lastPartNumber: _lastDiskNumber];
if (stream == nil)
@throw [OFInvalidFormatException exception];
_diskNumber++;
_stream = [stream retain];
[oldStream release];
}
entry = [[[OFZIPArchiveEntry alloc]
of_initWithStream: _stream] autorelease];
if ([_pathToEntryMap objectForKey: entry.fileName] != nil)
@throw [OFInvalidFormatException exception];
[_entries addObject: entry];
[_pathToEntryMap setObject: entry forKey: entry.fileName];
|
| ︙ | | |
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
|
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
|
+
+
-
+
|
}
- (OFStream *)streamForReadingFile: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
OFZIPArchiveEntry *entry;
OFZIPArchiveLocalFileHeader *localFileHeader;
uint32_t startDiskNumber;
int64_t offset64;
if (_stream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
if (_mode != modeRead)
@throw [OFInvalidArgumentException exception];
if ((entry = [_pathToEntryMap objectForKey: path]) == nil)
@throw [OFOpenItemFailedException exceptionWithPath: path
mode: @"r"
errNo: ENOENT];
@try {
[_lastReturnedStream close];
} @catch (OFNotOpenException *e) {
/* Might have already been closed by the user - that's fine. */
}
_lastReturnedStream = nil;
startDiskNumber = entry.of_startDiskNumber;
offset64 = entry.of_localFileHeaderOffset;
if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
@throw [OFOutOfRangeException exception];
seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
seekOrThrowInvalidFormat(self, &startDiskNumber,
(OFStreamOffset)offset64, OFSeekSet);
localFileHeader = [[[OFZIPArchiveLocalFileHeader alloc]
initWithStream: _stream] autorelease];
if (![localFileHeader matchesEntry: entry])
@throw [OFInvalidFormatException exception];
|
| ︙ | | |
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
|
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
|
-
+
+
|
entry: entry] autorelease];
return _lastReturnedStream;
}
- (OFStream *)streamForWritingEntry: (OFZIPArchiveEntry *)entry_
{
/* TODO: Avoid data descriptor when _stream is an OFSeekableStream */
int64_t offsetAdd = 0;
void *pool;
OFMutableZIPArchiveEntry *entry;
OFString *fileName;
bool seekable;
OFStreamOffset CRC32Offset = 0, size64Offset = 0;
OFData *extraField;
uint16_t fileNameLength, extraFieldLength;
if (_stream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
if (_mode != modeWrite && _mode != modeAppend)
|
| ︙ | | |
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
|
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
|
+
+
-
+
-
+
+
+
-
+
+
+
-
+
+
+
|
fileNameLength = fileName.UTF8StringLength;
extraField = entry.extraField;
extraFieldLength = extraField.count;
if (UINT16_MAX - extraFieldLength < 20)
@throw [OFOutOfRangeException exception];
seekable = [_stream isKindOfClass: [OFSeekableStream class]];
entry.versionMadeBy = (entry.versionMadeBy & 0xFF00) | 45;
entry.minVersionNeeded = (entry.minVersionNeeded & 0xFF00) | 45;
entry.compressedSize = 0;
entry.uncompressedSize = 0;
entry.CRC32 = 0;
entry.generalPurposeBitFlag |= (1u << 3) | (1u << 11);
entry.generalPurposeBitFlag |= (seekable ? 0 : (1u << 3)) | (1u << 11);
entry.of_localFileHeaderOffset = _offset;
[_stream writeLittleEndianInt32: 0x04034B50];
[_stream writeLittleEndianInt16: entry.minVersionNeeded];
[_stream writeLittleEndianInt16: entry.generalPurposeBitFlag];
[_stream writeLittleEndianInt16: entry.compressionMethod];
[_stream writeLittleEndianInt16: entry.of_lastModifiedFileTime];
[_stream writeLittleEndianInt16: entry.of_lastModifiedFileDate];
/* We use the data descriptor */
/* Written later or data descriptor used instead */
if (seekable)
CRC32Offset = [_stream seekToOffset: 0 whence: OFSeekCurrent];
[_stream writeLittleEndianInt32: 0];
/* We use ZIP64 */
[_stream writeLittleEndianInt32: 0xFFFFFFFF];
[_stream writeLittleEndianInt32: 0xFFFFFFFF];
[_stream writeLittleEndianInt16: fileNameLength];
[_stream writeLittleEndianInt16: extraFieldLength + 20];
offsetAdd += 4 + (5 * 2) + (3 * 4) + (2 * 2);
[_stream writeString: fileName];
offsetAdd += fileNameLength;
[_stream writeLittleEndianInt16: OFZIPArchiveEntryExtraFieldTagZIP64];
[_stream writeLittleEndianInt16: 16];
/* We use the data descriptor */
/* Written later or data descriptor used instead */
if (seekable)
size64Offset = [_stream seekToOffset: 0 whence: OFSeekCurrent];
[_stream writeLittleEndianInt64: 0];
[_stream writeLittleEndianInt64: 0];
offsetAdd += (2 * 2) + (2 * 8);
if (extraField != nil)
[_stream writeData: extraField];
offsetAdd += extraFieldLength;
if (INT64_MAX - _offset < offsetAdd)
@throw [OFOutOfRangeException exception];
_offset += offsetAdd;
_lastReturnedStream = [[OFZIPArchiveFileWriteStream alloc]
of_initWithArchive: self
stream: _stream
entry: entry];
entry: entry
CRC32Offset: CRC32Offset
size64Offset: size64Offset];
objc_autoreleasePoolPop(pool);
return [_lastReturnedStream autorelease];
}
- (void)of_writeCentralDirectory
|
| ︙ | | |
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
|
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
stream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry
{
self = [super init];
@try {
_archive = [archive retain];
_stream = [stream retain];
_compressionMethod = entry.compressionMethod;
switch (entry.compressionMethod) {
switch (_compressionMethod) {
case OFZIPArchiveEntryCompressionMethodNone:
_decompressedStream = [stream retain];
_decompressedStream = [_archive->_stream retain];
break;
case OFZIPArchiveEntryCompressionMethodDeflate:
_decompressedStream = [[OFInflateStream alloc]
initWithStream: stream];
initWithStream: _archive->_stream];
break;
case OFZIPArchiveEntryCompressionMethodDeflate64:
_decompressedStream = [[OFInflate64Stream alloc]
initWithStream: stream];
initWithStream: _archive->_stream];
break;
default:
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: nil];
}
_entry = [entry copy];
_toRead = entry.uncompressedSize;
_CRC32 = ~0;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
if (_stream != nil || _decompressedStream != nil)
if (_decompressedStream != nil)
[self close];
[_entry release];
if (_archive->_lastReturnedStream == self)
_archive->_lastReturnedStream = nil;
[_archive release];
[super dealloc];
}
- (bool)lowlevelIsAtEndOfStream
{
if (_stream == nil)
if (_decompressedStream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
return _atEndOfStream;
}
- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
{
size_t ret;
if (_stream == nil)
if (_decompressedStream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
if (_atEndOfStream)
return 0;
if ([_archive->_stream isAtEndOfStream] &&
if (_stream.atEndOfStream && !_decompressedStream.hasDataInReadBuffer)
@throw [OFTruncatedDataException exception];
![_decompressedStream hasDataInReadBuffer]) {
OFStream *oldStream = _archive->_stream, *oldDecompressedStream;
OFSeekableStream *stream;
if (_archive->_diskNumber >= _archive->_lastDiskNumber)
@throw [OFTruncatedDataException exception];
stream = [_archive->_delegate
archive: _archive
wantsPartNumbered: _archive->_diskNumber + 1
lastPartNumber: _archive->_lastDiskNumber];
if (stream == nil)
@throw [OFInvalidFormatException exception];
_archive->_diskNumber++;
_archive->_stream = [stream retain];
[oldStream release];
switch (_compressionMethod) {
case OFZIPArchiveEntryCompressionMethodNone:
oldDecompressedStream = _decompressedStream;
_decompressedStream = [_archive->_stream retain];
[oldDecompressedStream release];
break;
case OFZIPArchiveEntryCompressionMethodDeflate:
case OFZIPArchiveEntryCompressionMethodDeflate64:
[_decompressedStream
setUnderlyingStream: _archive->_stream];
break;
default:
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: nil];
}
}
#if SIZE_MAX >= UINT64_MAX
if (length > UINT64_MAX)
@throw [OFOutOfRangeException exception];
#endif
if (length > _toRead)
|
| ︙ | | |
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
|
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
|
-
+
-
+
-
-
+
-
-
-
+
+
+
+
|
expectedChecksum: expectedChecksum];
}
}
return ret;
}
- (bool)hasDataInReadBuffer
- (bool)lowlevelHasDataInReadBuffer
{
return (super.hasDataInReadBuffer ||
return ((OFStream *)_decompressedStream).hasDataInReadBuffer;
_decompressedStream.hasDataInReadBuffer);
}
- (int)fileDescriptorForReading
{
return ((id <OFReadyForReadingObserving>)_decompressedStream)
.fileDescriptorForReading;
}
- (void)close
{
if (_stream == nil || _decompressedStream == nil)
if (_decompressedStream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
[_stream release];
_stream = nil;
[_decompressedStream release];
_decompressedStream = nil;
[super close];
}
@end
@implementation OFZIPArchiveFileWriteStream
- (instancetype)of_initWithArchive: (OFZIPArchive *)archive
stream: (OFStream *)stream
entry: (OFMutableZIPArchiveEntry *)entry
CRC32Offset: (OFStreamOffset)CRC32Offset
size64Offset: (OFStreamOffset)size64Offset
{
self = [super init];
_archive = [archive retain];
_stream = [stream retain];
_entry = [entry retain];
_CRC32 = ~0;
_CRC32Offset = CRC32Offset;
_size64Offset = size64Offset;
return self;
}
- (void)dealloc
{
if (_stream != nil)
|
| ︙ | | |
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
|
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
+
|
_CRC32 = OFCRC32(_CRC32, buffer, length);
return length;
}
- (void)close
{
bool seekable;
if (_stream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
if (_bytesWritten > UINT64_MAX)
@throw [OFOutOfRangeException exception];
seekable = [_stream isKindOfClass: [OFSeekableStream class]];
if (seekable) {
OFStreamOffset offset = [_stream seekToOffset: 0
whence: OFSeekCurrent];
[_stream seekToOffset: _CRC32Offset whence: OFSeekSet];
[_stream writeLittleEndianInt32: ~_CRC32];
[_stream seekToOffset: _size64Offset whence: OFSeekSet];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
[_stream seekToOffset: offset whence: OFSeekSet];
} else {
[_stream writeLittleEndianInt32: 0x08074B50];
[_stream writeLittleEndianInt32: _CRC32];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
[_stream writeLittleEndianInt32: 0x08074B50];
[_stream writeLittleEndianInt32: ~_CRC32];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
[_stream writeLittleEndianInt64: (uint64_t)_bytesWritten];
}
[_stream release];
_stream = nil;
_entry.CRC32 = ~_CRC32;
_entry.compressedSize = _bytesWritten;
_entry.uncompressedSize = _bytesWritten;
[_entry makeImmutable];
if (!seekable)
_bytesWritten += (2 * 4 + 2 * 8);
_bytesWritten += (2 * 4 + 2 * 8);
[_archive->_entries addObject: _entry];
[_archive->_pathToEntryMap setObject: _entry forKey: _entry.fileName];
if (ULLONG_MAX - _archive->_offset < _bytesWritten)
@throw [OFOutOfRangeException exception];
_archive->_offset += _bytesWritten;
[super close];
}
@end
|