Changeset 286774 in webkit

Timestamp:

Dec 9, 2021, 3:42:39 AM (4 years ago)

Author:

youenn@apple.com

Message:

Copy ServiceWorkerNavigationPreloader error when failing its ServiceWorkerFetchTask
​https://bugs.webkit.org/show_bug.cgi?id=234002

Reviewed by Chris Dumez.

Covered by existing tests.

• NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:

When failing a ServiceWorkerNavigationPreloader, we might delete it, so it is not safe to manage a reference to its error.
Instead copy the error.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-09  Youenn Fablet  <youenn@apple.com>
+
+        Copy ServiceWorkerNavigationPreloader error when failing its ServiceWorkerFetchTask
+        https://bugs.webkit.org/show_bug.cgi?id=234002
+
+        Reviewed by Chris Dumez.
+
+        Covered by existing tests.
+
+        * NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:
+        When failing a ServiceWorkerNavigationPreloader, we might delete it, so it is not safe to manage a reference to its error.
+        Instead copy the error.
+
 2021-12-09  Myles C. Maxfield  <mmaxfield@apple.com> and Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp

@@ -365 +365 @@
 
         if (!m_preloader->error().isNull()) {
-            didFail(m_preloader->error());
+            // Let's copy the error as calling didFail might destroy m_preloader.
+            didFail(ResourceError { m_preloader->error() });
             return;
         }
@@ -389 +390 @@
             return;
         if (!m_preloader->error().isNull()) {
-            didFail(m_preloader->error());
+            // Let's copy the error as calling didFail might destroy m_preloader.
+            didFail(ResourceError { m_preloader->error() });
             return;
         }