Merge pull request steipete#13 from tibr/master

Adding error handling when trying to unarchive an invalid archive
danielctull-forks · Apr 11, 2012 · 42ad9c7 · 42ad9c7
2 parents 476065e + 23b51d2
commit 42ad9c7
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/SDURLCache.m b/SDURLCache.m
@@ -700,12 +700,23 @@ - (NSCachedURLResponse *)cachedResponseForRequest:(NSURLRequest *)request {
     dispatch_sync(get_disk_cache_queue(), ^{
         NSMutableDictionary *accesses = [self.diskCacheInfo objectForKey:kAFURLCacheInfoAccessesKey];
         if ([accesses objectForKey:cacheKey]) { // OPTI: Check for cache-hit in a in-memory dictionnary before to hit the FS
-            response = [NSKeyedUnarchiver unarchiveObjectWithFile:[_diskCachePath stringByAppendingPathComponent:cacheKey]];
-            if (response) {
-                // OPTI: Log the entry last access time for LRU cache eviction algorithm but don't save the dictionary
-                //       on disk now in order to save IO and time
-                [accesses setObject:[NSDate date] forKey:cacheKey];
-                _diskCacheInfoDirty = YES;
+            @try {
+                response = [NSKeyedUnarchiver unarchiveObjectWithFile:[_diskCachePath stringByAppendingPathComponent:cacheKey]];
+                if (response) {
+                    // OPTI: Log the entry last access time for LRU cache eviction algorithm but don't save the dictionary
+                    //       on disk now in order to save IO and time
+                    [accesses setObject:[NSDate date] forKey:cacheKey];
+                    _diskCacheInfoDirty = YES;
+                }
+            }
+            @catch (NSException *exception) {
+                if ([exception.name isEqualToString:NSInvalidArgumentException]) {
+                    NSLog(@"Could not unarchive object at %@, Invalid archive!", [_diskCachePath stringByAppendingPathComponent:cacheKey]);
+                    [self removeCachedResponseForRequest:request];
+                }
+            }
+            @finally {
+                // do nothing
             }
         }
     });