[webkit-changes] cvs commit: WebKit/Misc.subproj WebIconDatabase.m

[John]

sullivan    05/06/21 11:05:58

  Modified:    .        ChangeLog
               Misc.subproj WebIconDatabase.m
  Log:
          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
  
  Revision  Changes    Path
  1.3201    +10 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3200
  retrieving revision 1.3201
  diff -u -r1.3200 -r1.3201
  --- ChangeLog	21 Jun 2005 00:08:34 -0000	1.3200
  +++ ChangeLog	21 Jun 2005 18:05:55 -0000	1.3201
  @@ -1,3 +1,13 @@
  +2005-06-21  John Sullivan  <sullivan at apple.com>
  +
  +        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  <sullivan at apple.com>
   
           Reviewed by Chris Blumenberg.
  
  
  
  1.58      +8 -6      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- WebIconDatabase.m	21 Jun 2005 00:08:37 -0000	1.57
  +++ WebIconDatabase.m	21 Jun 2005 18:05:57 -0000	1.58
  @@ -686,14 +686,16 @@
       // 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];