Changeset 249805 in webkit

Timestamp:

Sep 12, 2019 3:59:09 AM (5 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Crashes when intercept response continues with original content
​https://bugs.webkit.org/show_bug.cgi?id=201707
<rdar://problem/55261857>

Reviewed by David Kilzer.

• WebProcess/Network/WebResourceLoader.cpp:

(WebKit::WebResourceLoader::didReceiveData):
Copy the data for the callback since the deferral may run it much later.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Network/WebResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-12  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Crashes when intercept response continues with original content
+        https://bugs.webkit.org/show_bug.cgi?id=201707
+        <rdar://problem/55261857>
+
+        Reviewed by David Kilzer.
+
+        * WebProcess/Network/WebResourceLoader.cpp:
+        (WebKit::WebResourceLoader::didReceiveData):
+        Copy the data for the callback since the deferral may run it much later.
+
 2019-09-12  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp

@@ -185 +185 @@
 
     if (UNLIKELY(m_interceptController.isIntercepting(m_coreLoader->identifier()))) {
-        m_interceptController.defer(m_coreLoader->identifier(), [this, protectedThis = makeRef(*this), data, encodedDataLength]() mutable {
+        auto buffer = WebCore::SharedBuffer::create(data.data(), data.size());
+        m_interceptController.defer(m_coreLoader->identifier(), [this, protectedThis = makeRef(*this), buffer = WTFMove(buffer), encodedDataLength]() mutable {
+            IPC::DataReference data(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
             if (m_coreLoader)
                 didReceiveData(data, encodedDataLength);