[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 8c8c0a7963cd6bf7afc48bc1f5829f8b251749e8
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 21:20:50 2004 +0000

            Reviewed by John
    
            Fix for this bug:
            <rdar://problem/3632163>: "REGRESSSION: crash on css home page"
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::positionForRenderer): Add null check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2db8967..a8ff1ec 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-23  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+        Fix for this bug:
+        <rdar://problem/3632163>: "REGRESSSION: crash on css home page"
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::positionForRenderer): Add null check.
+
 2004-04-20  David Hyatt  <hyatt at apple.com>
 
 	Fix hiermenu opacity bug.  Make sure to save/restore the graphics state before pushing and popping
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 0ff1e58..4ce40df 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2040,6 +2040,9 @@ Position RenderBlock::positionForRenderer(RenderObject *renderer, bool start) co
         return Position(element(), 0);
 
     NodeImpl *node = renderer->element() ? renderer->element() : element();
+    if (!node)
+        return Position();
+
     long offset = start ? node->caretMinOffset() : node->caretMaxOffset();
     return Position(node, offset);
 }

-- 
WebKit Debian packaging