Changeset 228957 in webkit

Timestamp:

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

Author:

jmarcell@apple.com

Message:

Cherry-pick r228931. rdar://problem/37816658

Location:

branches/safari-605-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2018-02-23  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228931. rdar://problem/37816658
+
+    2018-02-22  Chris Dumez  <cdumez@apple.com>
+
+            ServiceWorkerContainer::startScriptFetchForJob() fails to isolate copy the registrationKey before passing it to the main thread
+            https://bugs.webkit.org/show_bug.cgi?id=183050
+            <rdar://problem/37796881>
+
+            Reviewed by Youenn Fablet.
+
+            Create an isolated copy of the registrationKey before passing it to the main thread in ServiceWorkerContainer's
+            startScriptFetchForJob() / jobFinishedLoadingScript() / jobFailedLoadingScript().
+
+            * workers/service/ServiceWorkerContainer.cpp:
+            (WebCore::ServiceWorkerContainer::startScriptFetchForJob):
+            (WebCore::ServiceWorkerContainer::jobFinishedLoadingScript):
+            (WebCore::ServiceWorkerContainer::jobFailedLoadingScript):
+
 2018-02-23  Jason Marcell  <jmarcell@apple.com>
 

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

@@ -488 +488 @@
     if (!context) {
         LOG_ERROR("ServiceWorkerContainer::jobResolvedWithRegistration called but the container's ScriptExecutionContext is gone");
-        callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey(), scriptURL = job.data().scriptURL.isolatedCopy()] {
+        callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey().isolatedCopy(), scriptURL = job.data().scriptURL.isolatedCopy()] {
             connection->failedFetchingScript(jobIdentifier, registrationKey, { errorDomainWebKitInternal, 0, scriptURL, ASCIILiteral("Attempt to fetch service worker script with no ScriptExecutionContext") });
         });
@@ -506 +506 @@
     CONTAINER_RELEASE_LOG_IF_ALLOWED("jobFinishedLoadingScript: Successfuly finished fetching script for job %llu", job.identifier().toUInt64());
 
-    callOnMainThread([connection = m_swConnection, jobDataIdentifier = job.data().identifier(), registrationKey = job.data().registrationKey(), script = script.isolatedCopy(), contentSecurityPolicy = contentSecurityPolicy.isolatedCopy()] {
+    callOnMainThread([connection = m_swConnection, jobDataIdentifier = job.data().identifier(), registrationKey = job.data().registrationKey().isolatedCopy(), script = script.isolatedCopy(), contentSecurityPolicy = contentSecurityPolicy.isolatedCopy()] {
         connection->finishFetchingScriptInServer({ jobDataIdentifier, registrationKey, script, contentSecurityPolicy, { } });
     });
@@ -523 +523 @@
         job.promise()->reject(*exception);
 
-    callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey(), error = error.isolatedCopy()] {
+    callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey().isolatedCopy(), error = error.isolatedCopy()] {
         connection->failedFetchingScript(jobIdentifier, registrationKey, error);
     });