Reviewed by Mitz.

        - speculative fix for http://bugs.webkit.org/show_bug.cgi?id=15805
          <rdar://problem/5510779> crashes in isLoadingMultipartContent

        * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::isLoadingMultipartContent):
        Instead of asserting the frame loader is non-0, return false if it is 0.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bdba833a8b297ba33b224ecc17150fbf03f3a22e..8c02e39b5777d09726d52679d52333a8135696b9 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-02  Darin Adler  <darin@apple.com>
+
+        Reviewed by Mitz.
+
+        - speculative fix for http://bugs.webkit.org/show_bug.cgi?id=15805
+          <rdar://problem/5510779> crashes in isLoadingMultipartContent
+
+        * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::isLoadingMultipartContent):
+        Instead of asserting the frame loader is non-0, return false if it is 0.
+
 2007-11-02  Darin Adler  <darin@apple.com>
 
         Reviewed by Mitz.

diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp
index 204e4ba9710a8bd38b8ed4bd17a15d790255b63b..da3cfcdd0cb4b64d413f102a674e2a908c1edcba 100644 (file)
--- a/WebCore/loader/DocumentLoader.cpp
+++ b/WebCore/loader/DocumentLoader.cpp
@@ -672,8 +672,7 @@ bool DocumentLoader::isLoadingPlugIns() const
 
 bool DocumentLoader::isLoadingMultipartContent() const
 {
-    ASSERT(m_mainResourceLoader);
-    return m_mainResourceLoader->isLoadingMultipartContent();
+    return m_mainResourceLoader && m_mainResourceLoader->isLoadingMultipartContent();
 }
 
 bool DocumentLoader::startLoadingMainResource(unsigned long identifier)