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

[John]

sullivan    05/08/17 11:14:38

  Modified:    .        ChangeLog
               Misc.subproj WebIconDatabase.m
  Log:
          Reviewed by Geoff Garen.
  
          - fixed <rdar://problem/4219817> Particular icon database + bookmarks + history crashes Safari on launch
  
          * Misc.subproj/WebIconDatabase.m:
          (-[WebIconDatabase releaseIconForURL:]):
          Move line that might remove last reference to iconURL to the end of the block.
  
  Revision  Changes    Path
  1.3295    +10 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3294
  retrieving revision 1.3295
  diff -u -r1.3294 -r1.3295
  --- ChangeLog	17 Aug 2005 05:01:22 -0000	1.3294
  +++ ChangeLog	17 Aug 2005 18:14:35 -0000	1.3295
  @@ -1,3 +1,13 @@
  +2005-08-17  John Sullivan  <sullivan at apple.com>
  +
  +        Reviewed by Geoff Garen.
  +        
  +        - fixed <rdar://problem/4219817> Particular icon database + bookmarks + history crashes Safari on launch
  +
  +        * Misc.subproj/WebIconDatabase.m:
  +        (-[WebIconDatabase releaseIconForURL:]):
  +        Move line that might remove last reference to iconURL to the end of the block.
  +
   2005-08-16  Darin Adler  <darin at apple.com>
   
           Reviewed by Trey.
  
  
  
  1.60      +4 -2      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- WebIconDatabase.m	15 Aug 2005 00:58:25 -0000	1.59
  +++ WebIconDatabase.m	17 Aug 2005 18:14:38 -0000	1.60
  @@ -238,8 +238,6 @@
                   // There's at least one other retainer of this icon, so we need to forget the
                   // two-way links between this page URL and the icon URL, without blowing away
                   // the icon entirely.                
  -                [_private->pageURLToIconURL removeObjectForKey:pageURL];
  -            
                   id pageURLs = [_private->iconURLToPageURLs objectForKey:iconURL];
                   if ([pageURLs isKindOfClass:[NSMutableSet class]]) {
                       ASSERT([pageURLs containsObject:pageURL]);
  @@ -255,6 +253,10 @@
                       ASSERT([pageURLs isEqualToString:pageURL]);
                       [_private->iconURLToPageURLs removeObjectForKey:pageURL];
                   }
  +                
  +                // Remove iconURL from this dictionary last, since this might be the last
  +                // reference and we need to use it as a key for _private->iconURLToPageURLs above.
  +                [_private->pageURLToIconURL removeObjectForKey:pageURL];
               }
           }
       } else {