[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 d1ccca93980f48a1242c412aae241445798809ff
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 30 17:41:50 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3606146>: repro nil-deref in QWidget::move (www.stoltoffshore.com)
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::requestObject): Add check for NULL widget.
            (KHTMLPart::processObjectRequest): Add check for NULL widget.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 895c091..b31a983 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3606146>: repro nil-deref in QWidget::move (www.stoltoffshore.com)
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::requestObject): Add check for NULL widget.
+        (KHTMLPart::processObjectRequest): Add check for NULL widget.
+
 2004-03-29  David Hyatt  <hyatt at apple.com>
 
 	Make sure "auto" is allowed as a valid value when parsing rect shapes (e.g., for the clip property).
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 1f78965..d3708e8 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3126,7 +3126,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
   if ( child->m_bPreloaded )
   {
     // kdDebug(6005) << "KHTMLPart::requestObject preload" << endl;
-    if ( child->m_frame && child->m_part )
+    if ( child->m_frame && child->m_part && child->m_part->widget() )
       child->m_frame->setWidget( child->m_part->widget() );
 
     child->m_bPreloaded = false;
@@ -3234,7 +3234,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     }
 
     child->m_serviceType = mimetype;
-    if ( child->m_frame )
+    if ( child->m_frame && part->widget() )
       child->m_frame->setWidget( part->widget() );
 
 #if !APPLE_CHANGES

-- 
WebKit Debian packaging