commit 31ccc45cef471edd08ae3b9504f0f7c4648ad7de
author adele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jul 30 23:56:19 2007 +0000
committer adele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jul 30 23:56:19 2007 +0000
tree 0cf536976347b20e6aef7b01b026e510dbed43e0
parent 666d644619b859be89e534fe54917dbc20ae6b84

        Reviewed by Darin.

        Fix for <rdar://problem/5274937> Safari 3 breaks Missing Sync's WebKit code by crashing

        * loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::continueAfterContentPolicy): Nil check for the FrameLoader.



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

WebCore/ChangeLog

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f58c5c7..37f7086 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-30  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Fix for <rdar://problem/5274937> Safari 3 breaks Missing Sync's WebKit code by crashing
+
+        * loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::continueAfterContentPolicy): Nil check for the FrameLoader.
+
 2007-07-30  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Darin.

WebCore/loader/MainResourceLoader.cpp

diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index 9309b78..5b95419 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -248,7 +248,7 @@
 {
     ASSERT(m_waitingForContentPolicy);
     m_waitingForContentPolicy = false;
-    if (!frameLoader()->isStopping())
+    if (frameLoader() && !frameLoader()->isStopping())
         continueAfterContentPolicy(policy, m_response);
     deref(); // balances ref in didReceiveResponse
 }