[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit fda8dda269b9c11ccafbee2283c6aa398855c761
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 28 19:52:27 2003 +0000

    	- fixed 3465613 -- REGRESSION (111): Crash creating nib that
    	contains WebView
    
            Reviewed by Chris.
    
            * WebView.subproj/WebView.m:
            (-[WebView mainFrame]):
    	check for nil _private before dereferencing.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dda694c..9654ed9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-28  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3465613 -- REGRESSION (111): Crash creating nib that 
+	contains WebView
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView mainFrame]):
+	check for nil _private before dereferencing.
+
 2003-10-28  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3465591>: Security: Netscape plug-ins can execute JavaScript in other frames
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 7e27c12..106c063 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1324,7 +1324,11 @@ NS_ENDHANDLER
 
 - (WebFrame *)mainFrame
 {
-    return _private->mainFrame;
+    // This can be called in intialization, before _private has been set up (3465613)
+    if (_private != nil) {
+        return _private->mainFrame;
+    }
+    return nil;
 }
 
 - (WebBackForwardList *)backForwardList

-- 
WebKit Debian packaging