public/ZipArchive
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handling potential errors in zipOpenNewFileInZip

Browse Source
This commit is contained in:
Antoine Cœur
2017-10-02 02:59:21 +08:00
parent f6fd858c20
commit 2821ab5d3e
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ObjectiveCExample/ObjectiveCExampleTests/SSZipArchiveTests.m
+4 -8
View File
@@ -107,16 +107,15 @@
for (int test = 0; test < 20; test++) for (int test = 0; test < 20; test++)
{ {
// Zipping // Zipping
NSString *archivePath = [outputPath stringByAppendingPathComponent:[NSString stringWithFormat:@"queue_test_%d.zip",test]]; NSString *archivePath = [outputPath stringByAppendingPathComponent:[NSString stringWithFormat:@"queue_test_%d.zip", test]];
BOOL success = [SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths]; BOOL success = [SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
XCTAssertTrue(success); XCTAssertTrue(success);
long long threshold = 510000; // 510kB:size slightly smaller than a successful zip, but much larger than a failed one long long threshold = 510000; // 510kB:size slightly smaller than a successful zip, but much larger than a failed one
long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:archivePath error:nil][NSFileSize] longLongValue]; long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:archivePath error:nil][NSFileSize] longLongValue];
XCTAssertTrue(fileSize > threshold, @"zipping failed at %@!",archivePath); XCTAssertTrue(fileSize > threshold, @"zipping failed at %@!", archivePath);
} }
} }
- (void)testUnzipping { - (void)testUnzipping {
@@ -205,12 +204,11 @@
BOOL fileHasValidPassword = [SSZipArchive isPasswordValidForArchiveAtPath:zipPath password:@"passw0rd" error:&error]; BOOL fileHasValidPassword = [SSZipArchive isPasswordValidForArchiveAtPath:zipPath password:@"passw0rd" error:&error];
XCTAssertTrue(fileHasValidPassword,@"Valid password reports false."); XCTAssertTrue(fileHasValidPassword, @"Valid password reports false.");
BOOL fileHasInvalidValidPassword = [SSZipArchive isPasswordValidForArchiveAtPath:zipPath password:@"passw0rd123" error:&error]; BOOL fileHasInvalidValidPassword = [SSZipArchive isPasswordValidForArchiveAtPath:zipPath password:@"passw0rd123" error:&error];
XCTAssertFalse(fileHasInvalidValidPassword,@"Invalid password reports true."); XCTAssertFalse(fileHasInvalidValidPassword, @"Invalid password reports true.");
} }
- (void)testIsFilePasswordProtectedAtPath { - (void)testIsFilePasswordProtectedAtPath {
@@ -258,7 +256,6 @@
testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"]; testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped"); XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
} }
//Temp Disabled test, fix is not yet in the AES version of the unzip lib //Temp Disabled test, fix is not yet in the AES version of the unzip lib
@@ -428,7 +425,6 @@
XCTAssertEqual(delegate.numFilesUnzipped, 2); XCTAssertEqual(delegate.numFilesUnzipped, 2);
XCTAssertTrue(delegate.didUnzipArchive); XCTAssertTrue(delegate.didUnzipArchive);
XCTAssertEqual(delegate.loaded, delegate.total); XCTAssertEqual(delegate.loaded, delegate.total);
} }
// Commented out to avoid checking in several gig file into the repository. Simply add a file named // Commented out to avoid checking in several gig file into the repository. Simply add a file named
SSZipArchive/SSZipArchive.m
+16 -16
View File
@@ -54,7 +54,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
if (ret != UNZ_OK) { if (ret != UNZ_OK) {
return NO; return NO;
} }
unz_file_info fileInfo = {0}; unz_file_info fileInfo = {};
ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0); ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
if (ret != UNZ_OK) { if (ret != UNZ_OK) {
return NO; return NO;
@@ -103,7 +103,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
} }
return NO; return NO;
} }
unz_file_info fileInfo = {0}; unz_file_info fileInfo = {};
ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0); ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
if (ret != UNZ_OK) { if (ret != UNZ_OK) {
if (error) { if (error) {
@@ -241,7 +241,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
unsigned long long fileSize = [fileAttributes[NSFileSize] unsignedLongLongValue]; unsigned long long fileSize = [fileAttributes[NSFileSize] unsignedLongLongValue];
unsigned long long currentPosition = 0; unsigned long long currentPosition = 0;
unz_global_info globalInfo = {0ul, 0ul}; unz_global_info globalInfo = {};
unzGetGlobalInfo(zip, &globalInfo); unzGetGlobalInfo(zip, &globalInfo);
// Begin unzipping // Begin unzipping
@@ -409,7 +409,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
[directoriesModificationDates addObject: @{@"path": fullPath, @"modDate": modDate}]; [directoriesModificationDates addObject: @{@"path": fullPath, @"modDate": modDate}];
} }
if (isDirectory) { if (isDirectory) {
[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr error:&err]; [fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr error:&err];
} else { } else {
[fileManager createDirectoryAtPath:fullPath.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:directoryAttr error:&err]; [fileManager createDirectoryAtPath:fullPath.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:directoryAttr error:&err];
} }
@@ -764,7 +764,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
{ {
NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened"); NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
zip_fileinfo zipInfo = {0,0,0}; zip_fileinfo zipInfo = {};
NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil]; NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil];
if (attr) if (attr)
@@ -795,12 +795,12 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
} }
} }
unsigned int len = 0; int error = zipOpenNewFileInZip3(_zip, [folderName stringByAppendingString:@"/"].fileSystemRepresentation, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_NO_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL,
zipOpenNewFileInZip3(_zip, [folderName stringByAppendingString:@"/"].fileSystemRepresentation, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_NO_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL,
Z_DEFAULT_STRATEGY, password.UTF8String, 0); Z_DEFAULT_STRATEGY, password.UTF8String, 0);
unsigned int len = 0;
zipWriteInFileInZip(_zip, &len, 0); zipWriteInFileInZip(_zip, &len, 0);
zipCloseFileInZip(_zip); zipCloseFileInZip(_zip);
return YES; return error == ZIP_OK;
} }
- (BOOL)writeFile:(NSString *)path withPassword:(nullable NSString *)password; - (BOOL)writeFile:(NSString *)path withPassword:(nullable NSString *)password;
@@ -828,7 +828,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
aFileName = fileName.fileSystemRepresentation; aFileName = fileName.fileSystemRepresentation;
} }
zip_fileinfo zipInfo = {0,0,0}; zip_fileinfo zipInfo = {};
NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil]; NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil];
if (attr) if (attr)
@@ -862,22 +862,22 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
void *buffer = malloc(CHUNK); void *buffer = malloc(CHUNK);
if (buffer == NULL) if (buffer == NULL)
{ {
fclose(input);
return NO; return NO;
} }
zipOpenNewFileInZip3(_zip, aFileName, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, password.UTF8String, 0); int error = zipOpenNewFileInZip3(_zip, aFileName, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, password.UTF8String, 0);
unsigned int len = 0;
while (!feof(input) && !ferror(input)) while (!feof(input) && !ferror(input))
{ {
len = (unsigned int) fread(buffer, 1, CHUNK, input); unsigned int len = (unsigned int) fread(buffer, 1, CHUNK, input);
zipWriteInFileInZip(_zip, buffer, len); zipWriteInFileInZip(_zip, buffer, len);
} }
zipCloseFileInZip(_zip); zipCloseFileInZip(_zip);
free(buffer); free(buffer);
fclose(input); fclose(input);
return YES; return error == ZIP_OK;
} }
- (BOOL)writeData:(NSData *)data filename:(nullable NSString *)filename withPassword:(nullable NSString *)password; - (BOOL)writeData:(NSData *)data filename:(nullable NSString *)filename withPassword:(nullable NSString *)password;
@@ -888,15 +888,15 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain";
if (!data) { if (!data) {
return NO; return NO;
} }
zip_fileinfo zipInfo = {0,0,0}; zip_fileinfo zipInfo = {};
[self zipInfo:&zipInfo setDate:[NSDate date]]; [self zipInfo:&zipInfo setDate:[NSDate date]];
zipOpenNewFileInZip3(_zip, filename.fileSystemRepresentation, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, password.UTF8String, 0); int error = zipOpenNewFileInZip3(_zip, filename.fileSystemRepresentation, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, password.UTF8String, 0);
zipWriteInFileInZip(_zip, data.bytes, (unsigned int)data.length); zipWriteInFileInZip(_zip, data.bytes, (unsigned int)data.length);
zipCloseFileInZip(_zip); zipCloseFileInZip(_zip);
return YES; return error == ZIP_OK;
} }