Changeset 55270 in webkit

Timestamp:

Feb 25, 2010 11:40:05 PM (14 years ago)

Author:

mrowe@apple.com

Message:

<rdar://problem/7688455> REGRESSION(r55205): Crash inside dispatchEventsOnWindowAndFocusedNode when clicking link from bookmarks view

Reviewed by Brady Eidson.

Null-check the document's page to avoid dereferencing a null page.

No regression test is added as this appears to be dependent on an interaction with Safari's bookmarks view that is
not testable from within DumpRenderTree.

• page/FocusController.cpp:

(WebCore::dispatchEventsOnWindowAndFocusedNode):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-25  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        <rdar://problem/7688455> REGRESSION(r55205): Crash inside dispatchEventsOnWindowAndFocusedNode when clicking link from bookmarks view
+
+        Null-check the document's page to avoid dereferencing a null page.
+
+        No regression test is added as this appears to be dependent on an interaction with Safari's bookmarks view that is
+        not testable from within DumpRenderTree.
+
+        * page/FocusController.cpp:
+        (WebCore::dispatchEventsOnWindowAndFocusedNode):
+
 2010-02-25  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -62 +62 @@
     // If we have a focused node we should dispatch focus on it after we focus the window.
     // https://bugs.webkit.org/show_bug.cgi?id=27105
-  
+
     // Do not fire events while modal dialogs are up.  See https://bugs.webkit.org/show_bug.cgi?id=33962
-    if (document->page()->defersLoading())
-        return;
+    if (Page* page = document->page()) {
+        if (page->defersLoading())
+            return;
+    }
+
     if (!focused && document->focusedNode())
         document->focusedNode()->dispatchBlurEvent();