Changeset 227932 in webkit

Timestamp:

Jan 31, 2018 2:40:10 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Change SWServer::claim to set the iterator value as soon as possible
​https://bugs.webkit.org/show_bug.cgi?id=182337

Patch by Youenn Fablet <​youenn@apple.com> on 2018-01-31
Reviewed by Chris Dumez.

No change of behavior, this is a "let's go safe way" fix.

• workers/service/server/SWServer.cpp:

(WebCore::SWServer::claim):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-31  Youenn Fablet  <youenn@apple.com>
+
+        Change SWServer::claim to set the iterator value as soon as possible
+        https://bugs.webkit.org/show_bug.cgi?id=182337
+
+        Reviewed by Chris Dumez.
+
+        No change of behavior, this is a "let's go safe way" fix.
+
+        * workers/service/server/SWServer.cpp:
+        (WebCore::SWServer::claim):
+
 2018-01-31  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/workers/service/server/SWServer.cpp

@@ -421 +421 @@
         auto result = m_clientToControllingWorker.add(clientData.identifier, worker.identifier());
         if (!result.isNewEntry) {
-            if (result.iterator->value == worker.identifier())
+            auto previousIdentifier = result.iterator->value;
+            if (previousIdentifier == worker.identifier())
                 return;
-            if (auto* controllingRegistration = registrationFromServiceWorkerIdentifier(result.iterator->value))
+            result.iterator->value = worker.identifier();
+            if (auto* controllingRegistration = registrationFromServiceWorkerIdentifier(previousIdentifier))
                 controllingRegistration->removeClientUsingRegistration(clientData.identifier);
-            result.iterator->value = worker.identifier();
         }
         registration->controlClient(clientData.identifier);