2008-10-23 Darin Fisher <darin@chromium.org>

        Reviewed by Eric Seidel.

        m_frame null checked but then dereferenced
        https://bugs.webkit.org/show_bug.cgi?id=21845

        This error was found using a static analysis tool, and so I do not know
        how to produce a null m_frame on entry to this method.  Hence, I have
        not included a regression test.

        * page/EventHandler.cpp:
        (WebCore::EventHandler::allowDHTMLDrag): Add an early return.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75c2c38a02334b9b719027921376f66e93941dbc..7739dc8a6feba69e6fae31d81b08ffee1076bd40 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2008-10-23  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        m_frame null checked but then dereferenced
+        https://bugs.webkit.org/show_bug.cgi?id=21845
+
+        This error was found using a static analysis tool, and so I do not know
+        how to produce a null m_frame on entry to this method.  Hence, I have
+        not included a regression test.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::allowDHTMLDrag): Add an early return.
+
 2008-10-23  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Sam Weinig with no hesitation.

diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index dcb0aa243d1e192c5876a84974322731a7f36aae..8fba8abbca93b55946695b8c622e29a6d106f560 100644 (file)
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -677,6 +677,7 @@ void EventHandler::allowDHTMLDrag(bool& flagDHTML, bool& flagUA) const
     if (!m_frame || !m_frame->document()) {
         flagDHTML = false;
         flagUA = false;
+        return;
     }
     
     unsigned mask = m_frame->page()->dragController()->delegateDragSourceAction(m_frame->view()->contentsToWindow(m_mouseDownPos));