Fixed: <rdar://problem/3986013> Assertion failure going back after page load error...
authorcblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Feb 2005 21:31:22 +0000 (21:31 +0000)
committercblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Feb 2005 21:31:22 +0000 (21:31 +0000)
        Reviewed by rjw.

        * WebView.subproj/WebDataSource.m:
        (-[WebDataSource _setPrimaryLoadComplete:]): don't set the data source data when the main client is nil

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8505 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebView.subproj/WebDataSource.m

index 1b98160944f2d14daf7027956b49d8580858453f..aa626726fb92a0fd8c92a207b4c70d515b967940 100644 (file)
@@ -1,3 +1,12 @@
+2005-02-02  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3986013> Assertion failure going back after page load error (no apparent problem in nondebug build)
+
+        Reviewed by rjw.
+
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource _setPrimaryLoadComplete:]): don't set the data source data when the main client is nil
+
 2005-02-02  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Darin
index ee576728a9b4d20fe03d0cb9d305dd158d9ed2a0..9631ad04447d6435c74e0cf26c4f53d931488b65 100644 (file)
        // there's no callback for that.
         [self _loadIcon];
 
-        [self _setData:[_private->mainClient resourceData]];
-        [_private->mainClient release];
-        _private->mainClient = 0; 
+        if (_private->mainClient != nil) {
+            [self _setData:[_private->mainClient resourceData]];
+            [_private->mainClient release];
+            _private->mainClient = nil;
+        }
+        
         [self _updateLoading];
     }
 }