Changeset 229172 in webkit

Timestamp:

Mar 2, 2018 8:52:32 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

IOChannel::read and IOChannel::write can destroy the completion handler in the thread used to manipulate thread
​https://bugs.webkit.org/show_bug.cgi?id=183261

Patch by Youenn Fablet <​youenn@apple.com> on 2018-03-02
Reviewed by Antti Koivisto.

Moving the completion handler when being called so that it gets desttroyed in the thread it is called.

• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:

(WebKit::NetworkCache::IOChannel::read):
(WebKit::NetworkCache::IOChannel::write):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-02  Youenn Fablet  <youenn@apple.com>
+
+        IOChannel::read and IOChannel::write can destroy the completion handler in the thread used to manipulate thread
+        https://bugs.webkit.org/show_bug.cgi?id=183261
+
+        Reviewed by Antti Koivisto.
+
+        Moving the completion handler when being called so that it gets desttroyed in the thread it is called.
+
+        * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
+        (WebKit::NetworkCache::IOChannel::read):
+        (WebKit::NetworkCache::IOChannel::write):
+
 2018-03-02  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm

@@ -103 +103 @@
         DispatchPtr<dispatch_data_t> fileDataPtr(fileData);
         Data data(fileDataPtr);
-        completionHandler(data, error);
+        auto callback = WTFMove(completionHandler);
+        callback(data, error);
         didCallCompletionHandler = true;
     }).get());
@@ -113 +114 @@
     auto dispatchData = data.dispatchData();
     auto dispatchQueue = queue ? queue->dispatchQueue() : dispatch_get_main_queue();
-    dispatch_io_write(m_dispatchIO.get(), offset, dispatchData, dispatchQueue, BlockPtr<void(bool, dispatch_data_t, int)>::fromCallable([channel, completionHandler = WTFMove(completionHandler)](bool done, dispatch_data_t fileData, int error) {
+    dispatch_io_write(m_dispatchIO.get(), offset, dispatchData, dispatchQueue, BlockPtr<void(bool, dispatch_data_t, int)>::fromCallable([channel, completionHandler = WTFMove(completionHandler)](bool done, dispatch_data_t fileData, int error) mutable {
         ASSERT_UNUSED(done, done);
-        completionHandler(error);
+        auto callback = WTFMove(completionHandler);
+        callback(error);
     }).get());
 }