Merge pull request ZipArchive#221 from wooga/master

error properly when crc check fails
Jacedy · Dec 15, 2015 · 7ee91f6 · 7ee91f6
2 parents 578a157 + 7c60734
commit 7ee91f6
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m
@@ -325,7 +325,8 @@ + (BOOL)unzipFileAtPath:(NSString *)path
             crc_ret = unzCloseCurrentFile( zip );
             if (crc_ret == UNZ_CRCERROR) {
                 //CRC ERROR
-                return NO;
+                success = NO;
+                break;
             }
             ret = unzGoToNextFile( zip );
 
@@ -375,9 +376,19 @@ + (BOOL)unzipFileAtPath:(NSString *)path
         [delegate zipArchiveProgressEvent:fileSize total:fileSize];
     }
 
+    NSError *retErr = nil;
+    if (crc_ret == UNZ_CRCERROR)
+    {
+        NSDictionary *userInfo = @{NSLocalizedDescriptionKey: @"crc check failed for file"};
+        retErr = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-3 userInfo:userInfo];
+    }
+    if (error)
+    {
+        *error = retErr;
+    }
     if (completionHandler)
     {
-        completionHandler(path, YES, nil);
+        completionHandler(path, success, retErr);
     }
     return success;
 }