Changeset 256677 in webkit

Timestamp:

Feb 14, 2020 7:01:52 PM (4 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r256470. rdar://problem/59446998

ServiceWorkerContainer::jobResolvedWithRegistration scopeExit should capture all lambda parameters by value
​https://bugs.webkit.org/show_bug.cgi?id=207657

Reviewed by Chris Dumez.

shouldNotifyWhenResolved is captured by reference in the notifyIfExitEarly ScopeExit lambda.
The ScopeExit is not always called synchronously so it is unsafe to capture values by reference here.

• workers/service/ServiceWorkerContainer.cpp: (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@256470 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2020-02-14  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r256470. rdar://problem/59446998
+
+    ServiceWorkerContainer::jobResolvedWithRegistration scopeExit should capture all lambda parameters by value
+    https://bugs.webkit.org/show_bug.cgi?id=207657
+    
+    Reviewed by Chris Dumez.
+    
+    shouldNotifyWhenResolved is captured by reference in the notifyIfExitEarly ScopeExit lambda.
+    The ScopeExit is not always called synchronously so it is unsafe to capture values by reference here.
+    
+    * workers/service/ServiceWorkerContainer.cpp:
+    (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256470 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-02-12  Youenn Fablet  <youenn@apple.com>
+
+            ServiceWorkerContainer::jobResolvedWithRegistration scopeExit should capture all lambda parameters by value
+            https://bugs.webkit.org/show_bug.cgi?id=207657
+
+            Reviewed by Chris Dumez.
+
+            shouldNotifyWhenResolved is captured by reference in the notifyIfExitEarly ScopeExit lambda.
+            The ScopeExit is not always called synchronously so it is unsafe to capture values by reference here.
+
+            * workers/service/ServiceWorkerContainer.cpp:
+            (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
+
 2020-02-14  Russell Epstein  <repstein@apple.com>
 

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

@@ -384 +384 @@
     });
 
-    auto notifyIfExitEarly = WTF::makeScopeExit([this, protectedThis = makeRef(*this), key = data.key, &shouldNotifyWhenResolved] {
+    auto notifyIfExitEarly = WTF::makeScopeExit([this, protectedThis = makeRef(*this), key = data.key, shouldNotifyWhenResolved] {
         if (shouldNotifyWhenResolved == ShouldNotifyWhenResolved::Yes)
             notifyRegistrationIsSettled(key);