Reviewed, tweaked and landed by Anders.

        <rdar://problem/5247178> REGRESSION: With CSS Edit 2.5, a crash occurs at WebCore::DeprecatedString::DeprecatedString when page fails to be extracted

        Null check the provisional document loader. If an application stops the load
        inside of the didFailProvisionalLoad delegate method, the provisional document loader will be nulled out.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 01ba4b76c2774dda099bfe3de3d295f3bf044708..e1f0e273237e941748c6f235ccdbce68e8b12e12 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-04  Sam Weinig  <sam@webkit.org>
+
+        Reviewed, tweaked and landed by Anders.
+
+        <rdar://problem/5247178> REGRESSION: With CSS Edit 2.5, a crash occurs at WebCore::DeprecatedString::DeprecatedString when page fails to be extracted
+        
+        Null check the provisional document loader. If an application stops the load 
+        inside of the didFailProvisionalLoad delegate method, the provisional document loader will be nulled out.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+
 2007-06-04  Alp Toker  <alp.toker@collabora.co.uk>
 
         Reviewed by Anders.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 0a77cdac698d9921e1984a933751e280593c8255..899f93af9f9f06c1419283e6fa5015cc5d99a5be 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2746,7 +2746,7 @@ void FrameLoader::checkLoadCompleteForThisFrame()
                 // delegate callback.
                 if (pdl == m_provisionalDocumentLoader)
                     clearProvisionalLoad();
-                else {
+                else if (m_provisionalDocumentLoader) {
                     KURL unreachableURL = m_provisionalDocumentLoader->unreachableURL();
                     if (!unreachableURL.isEmpty() && unreachableURL == pdl->request().url())
                         shouldReset = false;