Merge pull request #221 from wooga/master

error properly when crc check fails
2015-12-15 09:33:23 -08:00
parent 578a157d88 7c60734bcc
commit 7ee91f6d86
1 changed files with 13 additions and 2 deletions
@@ -325,7 +325,8 @@
            crc_ret = unzCloseCurrentFile( zip );
            if (crc_ret == UNZ_CRCERROR) {
                //CRC ERROR
-                return NO;
+                success = NO;
+                break;
            }
            ret = unzGoToNextFile( zip );
            
@@ -375,9 +376,19 @@
        [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;
 }