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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 6309922d2bb9757603a571bb9baf0e7afc6468d3
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 23:35:17 2004 +0000

            Reviewed by John
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::paintObject): Add null check on DOM node before
            asking if it is contentEditable.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7031 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9aa8f92..2ef0919 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-07-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::paintObject): Add null check on DOM node before
+        asking if it is contentEditable.
+
 2004-07-14  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3595073, setting innerHTML on a <table> should work.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index b89ebf7..0cd07a5 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1312,12 +1312,11 @@ void RenderBlock::paintObject(PaintInfo& i, int _tx, int _ty)
         const Selection &s = document()->part()->selection();
         NodeImpl *caretNode = s.start().node();
         RenderObject *renderer = caretNode ? caretNode->renderer() : 0;
-        if (renderer && renderer->containingBlock() == this && caretNode->isContentEditable()) {
+        if (renderer && renderer->containingBlock() == this && caretNode && caretNode->isContentEditable()) {
             document()->part()->paintCaret(i.p, i.r);
             document()->part()->paintDragCaret(i.p, i.r);
         }
     }
-    
 
 #ifdef BOX_DEBUG
     if ( style() && style()->visibility() == VISIBLE ) {

-- 
WebKit Debian packaging