<rdar://problem/10405215> REGRESSION (r98178): World of Warcraft Launcher crashes...

https://bugs.webkit.org/show_bug.cgi?id=71743

Reviewed by Beth Dakin.

* page/FrameView.cpp:
(WebCore::FrameView::isOnActivePage): Added a check for a null m_frame.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6b5b96df3db1d789b2189bdb1fa90644b045cd3d..5c1bf8e07ef4c372cce72a47271bc6caf7c4d4b7 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-07  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10405215> REGRESSION (r98178): World of Warcraft Launcher crashes in FrameView::isOnActivePage()
+        https://bugs.webkit.org/show_bug.cgi?id=71743
+
+        Reviewed by Beth Dakin.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::isOnActivePage): Added a check for a null m_frame.
+
 2011-11-07  Dmitry Lomov  <dslomov@google.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=71534

diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 55cc57591a01e9f3d8f5acca01e3c91480252c2a..ad10290d0c385d2ba21c54f949a92dd9fae4150f 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -2429,6 +2429,8 @@ void FrameView::setVisibleScrollerThumbRect(const LayoutRect& scrollerThumb)
 
 bool FrameView::isOnActivePage() const
 {
+    if (!m_frame)
+        return false;
     if (m_frame->view() != this)
         return false;
     if (Document* document = m_frame->document())