From 93055e69f6814d36f672b734ed116916feca1c2d Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Tue, 8 Nov 2011 01:16:35 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@99508 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 10 ++++++++++ Source/WebCore/page/FrameView.cpp | 2 ++ 2 files changed, 12 insertions(+) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6b5b96df3db1..5c1bf8e07ef4 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2011-11-07 Dan Bernstein + + 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 https://bugs.webkit.org/show_bug.cgi?id=71534 diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 55cc57591a01..ad10290d0c38 100644 --- 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()) -- 2.36.0