Changeset 257222 in webkit

Timestamp:

Feb 24, 2020 11:01:53 AM (4 years ago)

Author:

youenn@apple.com

Message:

Protect WebProcessPool from null weak pointers in m_serviceWorkerProcesses map
​https://bugs.webkit.org/show_bug.cgi?id=208143
rdar://problem/58285589

Reviewed by Alex Christensen.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::updateServiceWorkerUserAgent):
(WebKit::WebProcessPool::updateProcessAssertions):
When iterating through the map, make sure it does not have a null entry.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-24  Youenn Fablet  <youenn@apple.com>
+
+        Protect WebProcessPool from null weak pointers in m_serviceWorkerProcesses map
+        https://bugs.webkit.org/show_bug.cgi?id=208143
+        rdar://problem/58285589
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createWebPage):
+        (WebKit::WebProcessPool::updateServiceWorkerUserAgent):
+        (WebKit::WebProcessPool::updateProcessAssertions):
+        When iterating through the map, make sure it does not have a null entry.
+
 2020-02-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1273 +1273 @@
     if (!m_serviceWorkerPreferences) {
         m_serviceWorkerPreferences = page->preferencesStore();
-        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values())
-            serviceWorkerProcess->updateServiceWorkerPreferencesStore(*m_serviceWorkerPreferences);
+        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values()) {
+            if (serviceWorkerProcess)
+                serviceWorkerProcess->updateServiceWorkerPreferencesStore(*m_serviceWorkerPreferences);
+        }
     }
     if (userContentController)
@@ -1304 +1306 @@
         return;
     m_serviceWorkerUserAgent = userAgent;
-    for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values())
-        serviceWorkerProcess->setServiceWorkerUserAgent(m_serviceWorkerUserAgent);
+    for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values()) {
+        if (serviceWorkerProcess)
+            serviceWorkerProcess->setServiceWorkerUserAgent(m_serviceWorkerUserAgent);
+    }
 }
 #endif
@@ -2108 +2112 @@
             return;
 #if ENABLE(SERVICE_WORKER)
-        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values())
-            serviceWorkerProcess->updateServiceWorkerProcessAssertion();
+        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values()) {
+            if (serviceWorkerProcess)
+                serviceWorkerProcess->updateServiceWorkerProcessAssertion();
+        }
 #endif
     });