Reviewed by Hyatt.

	Fixed: <rdar://problem/3936879> nil-deref, crash in InlineFlowBox::nodeAtPoint closing DHTML menus at hrweb.apple.com

        * khtml/rendering/render_block.cpp:
        (khtml::RenderBlock::fillInlineSelectionGaps): Added a nil check. If there is no selection, don't try to get the selection's containing block. If we do, we'll crash.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8299 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3779a5a616c7df077527c95f4ea0183b799b1de8..cb0aa0ba25a940bcefe0b4ded299999bcff249f1 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2005-01-04  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Hyatt.
+
+       Fixed: <rdar://problem/3936879> nil-deref, crash in InlineFlowBox::nodeAtPoint closing DHTML menus at hrweb.apple.com
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::fillInlineSelectionGaps): Added a nil check. If there is no selection, don't try to get the selection's containing block. If we do, we'll crash. 
+
 2005-01-04  David Hyatt  <hyatt@apple.com>
 
        Fix for 3937203, force an update of the dashboard regions when scrollbars are added/removed.

diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 662111bba6576f32ae2304981c384e4351a24c2d..79666e44ecddb9b6a19cdb11ec04dcbb5853289a 100644 (file)
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1461,7 +1461,9 @@ GapRects RenderBlock::fillInlineSelectionGaps(RenderBlock* rootBlock, int blockX
     GapRects result;
     
     RenderObject* selStart = canvas()->selectionStart();
-    bool containsStart = (selStart == this) || (selStart->containingBlock() == this);
+    // If there is no selection, don't try to get the selection's containing block. 
+    // If we do, we'll crash.
+    bool containsStart = (selStart && (selStart == this || selStart->containingBlock() == this));
 
     if (!firstLineBox()) {
         if (containsStart) {