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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 3dc55aaec32e57bcf0938a3f0337f3a8a4b6b786
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 8 17:23:11 2003 +0000

            Fixed 3221353.  Added check for nil part.
    
            Reviewed by Darin.
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLFrameElementImpl::detach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4043 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4c07807..7e4786d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-08  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3221353.  Added check for nil part.
+        
+        Reviewed by Darin.
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::detach):
+
 2003-04-07  Richard Williamson  <rjw at apple.com>
 
         Fix for 3220988.  Cancel frame load if it's detached before
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4c07807..7e4786d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-08  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3221353.  Added check for nil part.
+        
+        Reviewed by Darin.
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::detach):
+
 2003-04-07  Richard Williamson  <rjw at apple.com>
 
         Fix for 3220988.  Cancel frame load if it's detached before
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index e9b0cd6..1fbebe6 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -430,7 +430,8 @@ void HTMLFrameElementImpl::detach()
 	KHTMLView* w = getDocument()->view();
 	w->part()->decrementFrameCount();
         KHTMLPart *framePart = w->part()->findFrame( name.string() );
-        framePart->frameDetached();
+        if (framePart)
+            framePart->frameDetached();
     }
 
     HTMLElementImpl::detach();

-- 
WebKit Debian packaging