Title: [277129] branches/safari-611.2.7.1-branch/Source/WebKit
- Revision
- 277129
- Author
- repst...@apple.com
- Date
- 2021-05-06 14:49:09 -0700 (Thu, 06 May 2021)
Log 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
Modified Paths
Diff
Modified: branches/safari-611.2.7.1-branch/Source/WebKit/ChangeLog (277128 => 277129)
--- branches/safari-611.2.7.1-branch/Source/WebKit/ChangeLog 2021-05-06 21:47:50 UTC (rev 277128)
+++ branches/safari-611.2.7.1-branch/Source/WebKit/ChangeLog 2021-05-06 21:49:09 UTC (rev 277129)
@@ -1,3 +1,38 @@
+2021-05-06 Russell Epstein <repst...@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.fu...@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 <repst...@apple.com>
Cherry-pick r276514. rdar://problem/77473523
Modified: branches/safari-611.2.7.1-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp (277128 => 277129)
--- branches/safari-611.2.7.1-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-05-06 21:47:50 UTC (rev 277128)
+++ branches/safari-611.2.7.1-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-05-06 21:49:09 UTC (rev 277129)
@@ -269,7 +269,8 @@
});
// 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();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
