Attachment 358327 Details for Bug 192513 – Patch

[patch] Patch

bug-192513-20190104100043.patch (text/plain), 1.97 KB, created by youenn fablet on 2019-01-04 10:00:44 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-01-04 10:00:44 PST

Size: 1.97 KB

patch

obsolete

>Subversion Revision: 239594
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index efc892fd04c895ddff935c291eb1e50faa5497ca..06829147355e5951d95f55a3b83612b30a743696 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-04  Youenn Fablet  <youenn@apple.com>
>+
>+        Crash in WebCore::ServiceWorkerGlobalScope
>+        https://bugs.webkit.org/show_bug.cgi?id=192513
>+        <rdar://problem/46563880>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Store the identifier in its own variable to make sure we do not use workerThread after being moved.
>+
>+        * workers/service/ServiceWorkerGlobalScope.cpp:
>+        (WebCore::ServiceWorkerGlobalScope::skipWaiting):
>+
> 2019-01-03  Youenn Fablet  <youenn@apple.com>
> 
>         CSP violation reports should bypass CSP checks
>diff --git a/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp b/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp
>index fe429abb92e41ff4ec253301bf5f4bd34ac84bb4..88ad7ff786b2a43816608e9880cf97775d39d6ec 100644
>--- a/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp
>+++ b/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp
>@@ -62,7 +62,8 @@ void ServiceWorkerGlobalScope::skipWaiting(Ref<DeferredPromise>&& promise)
> 
>     callOnMainThread([workerThread = makeRef(thread()), requestIdentifier]() mutable {
>         if (auto* connection = SWContextManager::singleton().connection()) {
>-            connection->skipWaiting(workerThread->identifier(), [workerThread = WTFMove(workerThread), requestIdentifier] {
>+            auto identifier = workerThread->identifier();
>+            connection->skipWaiting(identifier, [workerThread = WTFMove(workerThread), requestIdentifier] {
>                 workerThread->runLoop().postTask([requestIdentifier](auto& context) {
>                     auto& scope = downcast<ServiceWorkerGlobalScope>(context);
>                     if (auto promise = scope.m_pendingSkipWaitingPromises.take(requestIdentifier))

Actions: View | Formatted Diff | Diff

Attachments on bug 192513: 358327