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

[Adele]

adele       05/08/25 14:49:23

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               Misc.subproj Tag: Safari-2-0-branch WebIconDatabase.m
  Log:
          Reviewed by John.
  
          Merged nil check for URLs from TOT
  
          * Misc.subproj/WebIconDatabase.m:
          (-[WebIconDatabase _releaseIconForIconURLString:]):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.56 +9 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.55
  retrieving revision 1.3118.4.56
  diff -u -r1.3118.4.55 -r1.3118.4.56
  --- ChangeLog	25 Aug 2005 19:05:24 -0000	1.3118.4.55
  +++ ChangeLog	25 Aug 2005 21:49:18 -0000	1.3118.4.56
  @@ -1,5 +1,14 @@
   === Safari-416.3 ===
   
  +2005-08-25  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by John.        
  +
  +        Merged nil check for URLs from TOT
  +
  +        * Misc.subproj/WebIconDatabase.m:
  +        (-[WebIconDatabase _releaseIconForIconURLString:]):
  +
   2005-08-24  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.53.10.3 +7 -5      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.53.10.2
  retrieving revision 1.53.10.3
  diff -u -r1.53.10.2 -r1.53.10.3
  --- WebIconDatabase.m	24 Aug 2005 18:00:21 -0000	1.53.10.2
  +++ WebIconDatabase.m	25 Aug 2005 21:49:23 -0000	1.53.10.3
  @@ -611,11 +611,13 @@
           // Remove the icon's associated site URLs
           [iconURLString retain];
           id URLs = [_private->iconURLToURLs objectForKey:iconURLString];
  -        if ([URLs isKindOfClass:[NSMutableSet class]]) {
  -            [_private->URLToIconURL removeObjectsForKeys:[URLs allObjects]];
  -        } else {
  -            ASSERT([URLs isKindOfClass:[NSString class]]);
  -            [_private->URLToIconURL removeObjectForKey:URLs];
  +        if (URLs != nil) {
  +            if ([URLs isKindOfClass:[NSMutableSet class]]) {
  +                [_private->URLToIconURL removeObjectsForKeys:[URLs allObjects]];
  +            } else {
  +                ASSERT([URLs isKindOfClass:[NSString class]]);
  +                [_private->URLToIconURL removeObjectForKey:URLs];
  +            }
           }
           [_private->iconURLToURLs removeObjectForKey:iconURLString];
           [iconURLString release];