[webkit-changes] cvs commit: WebKit/WebView.subproj WebDataSource.m

[Maciej]

mjs         05/12/26 00:06:14

  Modified:    .        ChangeLog
               WebView.subproj WebDataSource.m
  Log:
          Reviewed by Hyatt.
  
  	- fixed REGRESSION: world leak of WebDataSource
  	http://bugzilla.opendarwin.org/show_bug.cgi?id=6242
  
          * WebView.subproj/WebDataSource.m:
          (-[WebDataSource _stopLoading]): don't retain self until after
  	the possible early return.
  
  Revision  Changes    Path
  1.3428    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3427
  retrieving revision 1.3428
  diff -u -r1.3427 -r1.3428
  --- ChangeLog	25 Dec 2005 11:04:55 -0000	1.3427
  +++ ChangeLog	26 Dec 2005 08:06:06 -0000	1.3428
  @@ -1,3 +1,14 @@
  +2005-12-25  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Hyatt.
  +
  +	- fixed REGRESSION: world leak of WebDataSource
  +	http://bugzilla.opendarwin.org/show_bug.cgi?id=6242
  +
  +        * WebView.subproj/WebDataSource.m:
  +        (-[WebDataSource _stopLoading]): don't retain self until after
  +	the possible early return.
  +
   2005-12-24  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Geoff.
  
  
  
  1.218     +2 -2      WebKit/WebView.subproj/WebDataSource.m
  
  Index: WebDataSource.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
  retrieving revision 1.217
  retrieving revision 1.218
  diff -u -r1.217 -r1.218
  --- WebDataSource.m	25 Dec 2005 11:05:03 -0000	1.217
  +++ WebDataSource.m	26 Dec 2005 08:06:14 -0000	1.218
  @@ -367,8 +367,6 @@
   // WebFrame's job
   - (void)_stopLoading
   {
  -    [self retain];
  -
       // Always attempt to stop the icon loader because it may still be loading after the data source
       // is done loading and not stopping it can cause a world leak.
       [_private->iconLoader stopLoading];
  @@ -380,6 +378,8 @@
       if (!_private->loading)
   	return;
   
  +    [self retain];
  +
       _private->stopping = YES;
   
       if (_private->mainResourceLoader) {