Changeset 19525 in webkit

Timestamp:

Feb 9, 2007 2:44:41 AM (17 years ago)

Author:

mjs

Message:

Reviewed by Mitz.

<rdar://problem/4971224> REGRESSION: ASSERT in WebCore with Mail (12491)
​http://bugs.webkit.org/show_bug.cgi?id=12491

No test case. Not testable since there is no way to do substitute
data loads from layout tests.

• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::continueAfterContentPolicy): Don't dispatch data load callback when loading empty data.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Mitz.
+
+        <rdar://problem/4971224> REGRESSION: ASSERT in WebCore with Mail (12491)
+        http://bugs.webkit.org/show_bug.cgi?id=12491
+
+        No test case. Not testable since there is no way to do substitute
+        data loads from layout tests.
+        
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::continueAfterContentPolicy): Don't dispatch data load
+        callback when loading empty data.
+
 2007-02-09  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/loader/MainResourceLoader.cpp

@@ -231 +231 @@
     if (frameLoader() && !frameLoader()->isStopping())
         if (m_substituteData.isValid()) {
-            didReceiveData(m_substituteData.content()->data(), m_substituteData.content()->size(), m_substituteData.content()->size(), true);
+            if (m_substituteData.content()->size())
+                didReceiveData(m_substituteData.content()->data(), m_substituteData.content()->size(), m_substituteData.content()->size(), true);
             if (frameLoader() && !frameLoader()->isStopping()) 
                 didFinishLoading();