Changeset 276671 in webkit

Timestamp:

Apr 27, 2021 3:11:16 PM (3 years ago)

Author:

Fujii Hironori

Message:

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):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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-04-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -275 +275 @@
 
     // 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();
 }