Attachment 343060 Details for Bug 186674 – Patch

[patch] Patch

bug-186674-20180619182250.patch (text/plain), 2.35 KB, created by youenn fablet on 2018-06-19 09:22:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-06-19 09:22:55 PDT

Size: 2.35 KB

patch

obsolete

>Subversion Revision: 232956
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index caa68a91c233e184193dcd7b3665b7de1aa3e810..15da6f3697cc21f55d291a4727d8d97cfaa44a9d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-19  Youenn Fablet  <youenn@apple.com>
>+
>+        Need to properly handle removal of worker in SWServer::unregisterServiceWorkerClient timer lambda
>+        https://bugs.webkit.org/show_bug.cgi?id=186674
>+        <rdar://problem/40974812>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        While looping over the running workers map and trying to terminate some of the workers,
>+        there is a chance that the map will be modified synchronously which may affect iterating the map.
>+        This patch removes that potential threat.
>+
>+        * workers/service/server/SWServer.cpp:
>+        (WebCore::SWServer::unregisterServiceWorkerClient):
>+
> 2018-06-19  Youenn Fablet  <youenn@apple.com>
> 
>         Network Preflights do not show in WebInspector after moving CORS checks to NetworkProcess
>diff --git a/Source/WebCore/workers/service/server/SWServer.cpp b/Source/WebCore/workers/service/server/SWServer.cpp
>index 0310001af7601961c81e7a30fe5bb69b52bd4461..714fd380ed29084253302dd1e2a8f2be75e8bb2f 100644
>--- a/Source/WebCore/workers/service/server/SWServer.cpp
>+++ b/Source/WebCore/workers/service/server/SWServer.cpp
>@@ -773,10 +773,14 @@ void SWServer::unregisterServiceWorkerClient(const ClientOrigin& clientOrigin, S
>     if (clientIdentifiers.isEmpty()) {
>         ASSERT(!iterator->value.terminateServiceWorkersTimer);
>         iterator->value.terminateServiceWorkersTimer = std::make_unique<Timer>([clientOrigin, this] {
>+            Vector<SWServerWorker*> workersToTerminate;
>             for (auto& worker : m_runningOrTerminatingWorkers.values()) {
>                 if (worker->isRunning() && worker->origin() == clientOrigin)
>-                    terminateWorker(worker);
>+                    workersToTerminate.append(worker.ptr());
>             }
>+            for (auto* worker : workersToTerminate)
>+                terminateWorker(*worker);
>+
>             if (!m_clientsBySecurityOrigin.contains(clientOrigin.clientOrigin)) {
>                 if (auto* connection = SWServerToContextConnection::connectionForOrigin(clientOrigin.clientOrigin))
>                     connection->connectionMayNoLongerBeNeeded();

Actions: View | Formatted Diff | Diff

Attachments on bug 186674: 342818 | 343015 | 343060 | 343064