[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 bedca1f5042756884dc1228d10c034711c0d4d4b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 14:45:03 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3743204> REGRESSION: crash at startribune.com in InlineBox::root()
    
            * khtml/rendering/render_flow.cpp: (RenderFlow::dirtyLinesFromChangedChild):
            Added a check for nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2b0db3b..378cf72 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3743204> REGRESSION: crash at startribune.com in InlineBox::root()
+
+        * khtml/rendering/render_flow.cpp: (RenderFlow::dirtyLinesFromChangedChild):
+        Added a check for nil.
+
 2004-07-27  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index baceafe..b1de929 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -240,7 +240,7 @@ void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child, bool adding)
         if (box)
             break;
     }
-    if (!box)
+    if (!box && firstLineBox())
         box = firstLineBox()->root();
 
     // If we found a line box, then dirty it.

-- 
WebKit Debian packaging