[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
eric at webkit.org
eric at webkit.org
Thu Dec 3 13:22:13 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 110fc8b1c0a58e6780b940d4b0660e0664d695a3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 00:22:14 2009 +0000
2009-10-28 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
REGRESSION: crashes in WebCore::RedirectScheduler::timerFired(WebCore::Timer<WebCore::RedirectScheduler>*)
https://bugs.webkit.org/show_bug.cgi?id=30839
Added null check for the case when the frame is detached from the page.
* loader/RedirectScheduler.cpp:
(WebCore::RedirectScheduler::timerFired):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50251 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9df9f75..c3b921e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-28 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION: crashes in WebCore::RedirectScheduler::timerFired(WebCore::Timer<WebCore::RedirectScheduler>*)
+ https://bugs.webkit.org/show_bug.cgi?id=30839
+
+ Added null check for the case when the frame is detached from the page.
+
+ * loader/RedirectScheduler.cpp:
+ (WebCore::RedirectScheduler::timerFired):
+
2009-10-28 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/loader/RedirectScheduler.cpp b/WebCore/loader/RedirectScheduler.cpp
index e419926..c0d78ae 100644
--- a/WebCore/loader/RedirectScheduler.cpp
+++ b/WebCore/loader/RedirectScheduler.cpp
@@ -267,7 +267,8 @@ void RedirectScheduler::scheduleHistoryNavigation(int steps)
void RedirectScheduler::timerFired(Timer<RedirectScheduler>*)
{
- ASSERT(m_frame->page());
+ if (!m_frame->page())
+ return;
if (m_frame->page()->defersLoading())
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list