From 5d4d9738ade83b2823a6ebc4b1e922fdb2cd8404 Mon Sep 17 00:00:00 2001 From: sullivan Date: Tue, 21 Jun 2005 18:05:57 +0000 Subject: [PATCH] Reviewed by Vicki Murley - fixed assertion failure Vicki ran into * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _forgetIconForIconURLString:]): Handle the case where there are no associated page URLs for the icon URL git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9446 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/ChangeLog | 10 ++++++++++ WebKit/Misc.subproj/WebIconDatabase.m | 14 ++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index f91eb4d..5a82fce 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,13 @@ +2005-06-21 John Sullivan + + Reviewed by Vicki Murley + + - fixed assertion failure Vicki ran into + + * Misc.subproj/WebIconDatabase.m: + (-[WebIconDatabase _forgetIconForIconURLString:]): + Handle the case where there are no associated page URLs for the icon URL + 2005-06-20 John Sullivan Reviewed by Chris Blumenberg. diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m index 5d2635f..86caf8a 100644 --- a/WebKit/Misc.subproj/WebIconDatabase.m +++ b/WebKit/Misc.subproj/WebIconDatabase.m @@ -686,14 +686,16 @@ NSSize WebIconLargeSize = {128, 128}; // Remove negative cache item for icon, if any [_private->iconURLsWithNoIcons removeObject:iconURLString]; - // Remove the icon's associated site URLs + // Remove the icon's associated site URLs, if any [iconURLString retain]; id URLs = [_private->iconURLToPageURLs objectForKey:iconURLString]; - if ([URLs isKindOfClass:[NSMutableSet class]]) { - [_private->pageURLToIconURL removeObjectsForKeys:[URLs allObjects]]; - } else { - ASSERT([URLs isKindOfClass:[NSString class]]); - [_private->pageURLToIconURL removeObjectForKey:URLs]; + if (URLs != nil) { + if ([URLs isKindOfClass:[NSMutableSet class]]) { + [_private->pageURLToIconURL removeObjectsForKeys:[URLs allObjects]]; + } else { + ASSERT([URLs isKindOfClass:[NSString class]]); + [_private->pageURLToIconURL removeObjectForKey:URLs]; + } } [_private->iconURLToPageURLs removeObjectForKey:iconURLString]; [iconURLString release]; -- 1.8.3.1