Title: [149204] trunk/Source/WebKit2
Revision
149204
Author
a...@apple.com
Date
2013-04-26 12:42:29 -0700 (Fri, 26 Apr 2013)

Log Message

        Crashes under ResourceHandle::continueDidReceiveResponse when loading blobs
        https://bugs.webkit.org/show_bug.cgi?id=115273

        Reviewed by Anders Carlsson.

        Covered by multiple existing tests (when using NetworkProcess), including:
        - http/tests/fileapi/blob-url-in-subframe.html
        - http/tests/fileapi/create-blob-url-from-data-url.html

        * NetworkProcess/NetworkResourceLoader.cpp:
        (WebKit::NetworkResourceLoader::continueDidReceiveResponse):
        Work around BlobResourceHandle badness.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (149203 => 149204)


--- trunk/Source/WebKit2/ChangeLog	2013-04-26 19:09:56 UTC (rev 149203)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-26 19:42:29 UTC (rev 149204)
@@ -1,5 +1,20 @@
 2013-04-26  Alexey Proskuryakov  <a...@apple.com>
 
+        Crashes under ResourceHandle::continueDidReceiveResponse when loading blobs
+        https://bugs.webkit.org/show_bug.cgi?id=115273
+
+        Reviewed by Anders Carlsson.
+
+        Covered by multiple existing tests (when using NetworkProcess), including:
+        - http/tests/fileapi/blob-url-in-subframe.html
+        - http/tests/fileapi/create-blob-url-from-data-url.html
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::continueDidReceiveResponse):
+        Work around BlobResourceHandle badness.
+
+2013-04-26  Alexey Proskuryakov  <a...@apple.com>
+
         [WK2] Remove NetworkResourceLoader::cleanupOnMainThread
         https://bugs.webkit.org/show_bug.cgi?id=115268
 

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (149203 => 149204)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2013-04-26 19:09:56 UTC (rev 149203)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2013-04-26 19:42:29 UTC (rev 149204)
@@ -234,6 +234,11 @@
 
 void NetworkResourceLoader::continueDidReceiveResponse()
 {
+    // FIXME: Remove this check once BlobResourceHandle implements didReceiveResponseAsync correctly.
+    // Currently, it does not wait for response, so the load is likely to finish before continueDidReceiveResponse.
+    if (!m_handle)
+        return;
+
     m_handle->continueDidReceiveResponse();
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to