Changeset 228956 in webkit

Timestamp:

Feb 23, 2018 12:30:01 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r228928. rdar://problem/37816673

Location:

branches/safari-605-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/ServiceWorkerContainer.cpp (modified) (1 diff)

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-23  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228928. rdar://problem/37816673
+
+    2018-02-22  Chris Dumez  <cdumez@apple.com>
+
+            ServiceWorkerContainer::scheduleJob() fails to isolate copy the jobData before passing it to the main thread
+            https://bugs.webkit.org/show_bug.cgi?id=183046
+            <rdar://problem/37793395>
+
+            Reviewed by Youenn Fablet.
+
+            Make sure we isolate copy the jobData before passing it to the main thread in ServiceWorkerContainer::scheduleJob().
+            The jobData contains Strings / URLs so it is not safe to have non-isolated copies of it on various threads.
+
+            * workers/service/ServiceWorkerContainer.cpp:
+            (WebCore::ServiceWorkerContainer::scheduleJob):
+
 2018-02-21  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/workers/service/ServiceWorkerContainer.cpp

@@ -239 +239 @@
     setPendingActivity(this);
 
-    auto jobData = job->data();
+    auto& jobData = job->data();
     auto result = m_jobMap.add(job->identifier(), WTFMove(job));
     ASSERT_UNUSED(result, result.isNewEntry);
 
-    callOnMainThread([connection = m_swConnection, contextIdentifier = this->contextIdentifier(), jobData = WTFMove(jobData)] {
+    callOnMainThread([connection = m_swConnection, contextIdentifier = this->contextIdentifier(), jobData = jobData.isolatedCopy()] {
         connection->scheduleJob(contextIdentifier, jobData);
     });