Changeset 259685 in webkit

Timestamp:

Apr 7, 2020, 4:36:04 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r257222. rdar://problem/61414891

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.

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

Location:

branches/safari-609-branch/Source/WebKit

Files:

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

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

@@ +1 @@
+2020-04-07  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r257222. rdar://problem/61414891
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257222 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-04-06  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1267 +1267 @@
     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)
@@ -1298 +1300 @@
         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
@@ -2102 +2106 @@
             return;
 #if ENABLE(SERVICE_WORKER)
-        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values())
-            serviceWorkerProcess->updateServiceWorkerProcessAssertion();
+        for (auto& serviceWorkerProcess : m_serviceWorkerProcesses.values()) {
+            if (serviceWorkerProcess)
+                serviceWorkerProcess->updateServiceWorkerProcessAssertion();
+        }
 #endif
     });