From a230f6aba8f9888d784592058561b0d7b83add91 Mon Sep 17 00:00:00 2001 From: Olivier Poitrey Date: Thu, 31 Dec 2009 14:12:50 +0100 Subject: [PATCH] Handle nil image urls nicely --- SDImageCache.m | 12 +++++++++++- SDWebImageManager.m | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SDImageCache.m b/SDImageCache.m index a7fe3b8..caa287b 100644 --- a/SDImageCache.m +++ b/SDImageCache.m @@ -126,7 +126,7 @@ static SDImageCache *instance; - (void)storeImage:(UIImage *)image forKey:(NSString *)key toDisk:(BOOL)toDisk { - if (image == nil) + if (image == nil || key == nil) { return; } @@ -146,6 +146,11 @@ static SDImageCache *instance; - (UIImage *)imageFromKey:(NSString *)key fromDisk:(BOOL)fromDisk { + if (key == nil) + { + return nil; + } + UIImage *image = [memCache objectForKey:key]; if (!image && fromDisk) @@ -163,6 +168,11 @@ static SDImageCache *instance; - (void)removeImageForKey:(NSString *)key { + if (key == nil) + { + return; + } + [memCache removeObjectForKey:key]; [[NSFileManager defaultManager] removeItemAtPath:[self cachePathForKey:key] error:nil]; } diff --git a/SDWebImageManager.m b/SDWebImageManager.m index 21dc3f4..9eca925 100644 --- a/SDWebImageManager.m +++ b/SDWebImageManager.m @@ -53,7 +53,7 @@ static SDWebImageManager *instance; - (void)downloadWithURL:(NSURL *)url delegate:(id)delegate { - if ([failedURLs containsObject:url]) + if (url == nil || [failedURLs containsObject:url]) { return; }