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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 014756cda9a3a3d01a0a2b9a26e5abc431e136d4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 22:51:33 2003 +0000

            Reviewed by John.
    
    	- fixed 3144560 -- non-reproducible nil-dereference in HTMLFrameElementImpl::updateForNewURL at macfixit
    
            * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL): Add check for nil view.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 59e7117..f2a8ce3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,14 @@
 
         Reviewed by John.
 
+	- fixed 3144560 -- non-reproducible nil-dereference in HTMLFrameElementImpl::updateForNewURL at macfixit
+
+        * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL): Add check for nil view.
+
+2003-01-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3154647 -- Triple clicked on a line of text (to select entire line), crashola
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 59e7117..f2a8ce3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,14 @@
 
         Reviewed by John.
 
+	- fixed 3144560 -- non-reproducible nil-dereference in HTMLFrameElementImpl::updateForNewURL at macfixit
+
+        * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL): Add check for nil view.
+
+2003-01-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3154647 -- Triple clicked on a line of text (to select entire line), crashola
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 7c005b7..1aa7b48 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -263,13 +263,18 @@ void HTMLFrameElementImpl::updateForNewURL()
         return;
     }
 
-    // load the frame contents
     KHTMLView *w = getDocument()->view();
-    KHTMLPart *part = w->part()->findFrame( name.string() );
-    if (part) {
-        part->openURL(getDocument()->completeURL(url.string()));
+    if (!w) {
+        return;
+    }
+    
+    // Load the frame contents.
+    KHTMLPart *part = w->part();
+    KHTMLPart *framePart = part->findFrame(name.string());
+    if (framePart) {
+        framePart->openURL(getDocument()->completeURL(url.string()));
     } else {
-        w->part()->requestFrame(static_cast<RenderFrame*>(m_render), url.string(), name.string());
+        part->requestFrame(static_cast<RenderFrame *>(m_render), url.string(), name.string());
     }
 }
 

-- 
WebKit Debian packaging