[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 64295d9484c6aed92d7200ed9a8f9d577b43767f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 15 04:58:58 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3458937: nil-deref in timed layout
    
            * khtml/khtmlview.cpp: (KHTMLView::layout): Add a nil check for m_part.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5797 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d113cac..b3d8246 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,14 @@
 
         Reviewed by Maciej.
 
+        - fixed 3458937: nil-deref in timed layout
+
+        * khtml/khtmlview.cpp: (KHTMLView::layout): Add a nil check for m_part.
+
+2003-12-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
         - fixed 3311205: click() on a file input type form element does not work bring up the file chooser as it does in IE
 
         * khtml/html/html_formimpl.cpp:
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index ec82ae0..9a1e9c9 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -513,15 +513,25 @@ void KHTMLView::layout()
     killTimer(d->layoutTimerId);
     d->layoutTimerId = 0;
 
+    if (!m_part) {
+        // FIXME: Do we need to set _width here?
+        // FIXME: Should we set _height here too?
+        _width = visibleWidth();
+        return;
+    }
+
     DOM::DocumentImpl* document = m_part->xmlDocImpl();
     if (!document) {
+        // FIXME: Should we set _height here too?
         _width = visibleWidth();
         return;
     }
 
     khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas*>(document->renderer());
-    if (!root)
+    if (!root) {
+        // FIXME: Do we need to set _width or _height here?
         return;
+    }
 
     ScrollBarMode hMode = d->hmode;
     ScrollBarMode vMode = d->vmode;

-- 
WebKit Debian packaging