Changeset 277129 in webkit

Timestamp:

May 6, 2021 2:49:09 PM (3 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r276671. rdar://problem/77620890

HashTableConstIterator's consistency assertion fails while closing m_webIDBServers in NetworkProcess::didClose since r275846
​https://bugs.webkit.org/show_bug.cgi?id=225089

Reviewed by Chris Dumez.

The items of m_webIDBServers were removed while iterating
m_webIDBServers.

Move m_webIDBServers to a temporary HashMap before iterating.

• NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::didClose):

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

Location:

branches/safari-611.2.7.1-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)

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

@@ +1 @@
+2021-05-06  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r276671. rdar://problem/77620890
+
+    HashTableConstIterator's consistency assertion fails while closing m_webIDBServers in NetworkProcess::didClose since r275846
+    https://bugs.webkit.org/show_bug.cgi?id=225089
+    
+    Reviewed by Chris Dumez.
+    
+    The items of m_webIDBServers were removed while iterating
+    m_webIDBServers.
+    
+    Move m_webIDBServers to a temporary HashMap before iterating.
+    
+    * NetworkProcess/NetworkProcess.cpp:
+    (WebKit::NetworkProcess::didClose):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276671 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-04-27  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+            HashTableConstIterator's consistency assertion fails while closing m_webIDBServers in NetworkProcess::didClose since r275846
+            https://bugs.webkit.org/show_bug.cgi?id=225089
+
+            Reviewed by Chris Dumez.
+
+            The items of m_webIDBServers were removed while iterating
+            m_webIDBServers.
+
+            Move m_webIDBServers to a temporary HashMap before iterating.
+
+            * NetworkProcess/NetworkProcess.cpp:
+            (WebKit::NetworkProcess::didClose):
+
 2021-05-03  Russell Epstein  <repstein@apple.com>
 

branches/safari-611.2.7.1-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -270 +270 @@
 
     // Make sure references to NetworkProcess in spaceRequester and closeHandler is removed.
-    for (auto& server : m_webIDBServers.values())
+    auto servers = std::exchange(m_webIDBServers, { });
+    for (auto& server : servers.values())
         server->close();
 }