Reviewed by Darin and Tim.

        <rdar://problem/4799949> REGRESSION: Crash in FrameMac::eventMayStartDrag() by clicking on a page

        * page/mac/EventHandlerMac.mm:
        (WebCore::EventHandler::eventMayStartDrag):
        Add nil check of hitTest's result.innerNode().

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ec7f8d4ebad44fca98a2a82785b99ecf439c7c1f..b569dc70cb9f4a4aec1bb4758ef8cb603025a359 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,14 @@
-2006-11-15  Timothy Hatcher  <timothy@apple.com>
+2006-11-16  David Harrison  <harrison@apple.com>
+
+        Reviewed by Darin and Tim.
+
+        <rdar://problem/4799949> REGRESSION: Crash in FrameMac::eventMayStartDrag() by clicking on a page
+        
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::eventMayStartDrag):
+        Add nil check of hitTest's result.innerNode().
+
+2006-11-16  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.
 

diff --git a/WebCore/page/mac/EventHandlerMac.mm b/WebCore/page/mac/EventHandlerMac.mm
index e22da02e26c5183754ee991bac4fe546021cd4c5..3bc27ec0259e68c4b4a6d2e21081ebb2da45b913 100644 (file)
--- a/WebCore/page/mac/EventHandlerMac.mm
+++ b/WebCore/page/mac/EventHandlerMac.mm
@@ -524,7 +524,7 @@ bool EventHandler::eventMayStartDrag(NSEvent *event) const
     HitTestResult result(mouseDownPos);
     m_frame->renderer()->layer()->hitTest(request, result);
     bool srcIsDHTML;
-    return result.innerNode()->renderer()->draggableNode(DHTMLFlag, UAFlag, mouseDownPos.x(), mouseDownPos.y(), srcIsDHTML);
+    return result.innerNode() && result.innerNode()->renderer()->draggableNode(DHTMLFlag, UAFlag, mouseDownPos.x(), mouseDownPos.y(), srcIsDHTML);
 }
 
 bool EventHandler::dragHysteresisExceeded(const FloatPoint& floatDragViewportLocation) const