Title: [248654] branches/safari-608-branch/Source/WebKit
- Revision
- 248654
- Author
- alanc...@apple.com
- Date
- 2019-08-13 18:19:28 -0700 (Tue, 13 Aug 2019)
Log Message
Cherry-pick r248633. rdar://problem/54282803
Fix potential thread safety issue under StorageManager::getSessionStorageOrigins()
https://bugs.webkit.org/show_bug.cgi?id=200684
Reviewed by Geoffrey Garen.
Fix potential thread safety issue under StorageManager::getSessionStorageOrigins(). The origins are being
passed from the background queue to the main thread without isolated copy.
* NetworkProcess/WebStorage/StorageManager.cpp:
(WebKit::StorageManager::getSessionStorageOrigins):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (248653 => 248654)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-14 01:19:26 UTC (rev 248653)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-14 01:19:28 UTC (rev 248654)
@@ -1,5 +1,36 @@
2019-08-13 Alan Coon <alanc...@apple.com>
+ Cherry-pick r248633. rdar://problem/54282803
+
+ Fix potential thread safety issue under StorageManager::getSessionStorageOrigins()
+ https://bugs.webkit.org/show_bug.cgi?id=200684
+
+ Reviewed by Geoffrey Garen.
+
+ Fix potential thread safety issue under StorageManager::getSessionStorageOrigins(). The origins are being
+ passed from the background queue to the main thread without isolated copy.
+
+ * NetworkProcess/WebStorage/StorageManager.cpp:
+ (WebKit::StorageManager::getSessionStorageOrigins):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-13 Chris Dumez <cdu...@apple.com>
+
+ Fix potential thread safety issue under StorageManager::getSessionStorageOrigins()
+ https://bugs.webkit.org/show_bug.cgi?id=200684
+
+ Reviewed by Geoffrey Garen.
+
+ Fix potential thread safety issue under StorageManager::getSessionStorageOrigins(). The origins are being
+ passed from the background queue to the main thread without isolated copy.
+
+ * NetworkProcess/WebStorage/StorageManager.cpp:
+ (WebKit::StorageManager::getSessionStorageOrigins):
+
+2019-08-13 Alan Coon <alanc...@apple.com>
+
Cherry-pick r248598. rdar://problem/54282797
Crash under IPC::Connection::markCurrentlyDispatchedMessageAsInvalid()
Modified: branches/safari-608-branch/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp (248653 => 248654)
--- branches/safari-608-branch/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp 2019-08-14 01:19:26 UTC (rev 248653)
+++ branches/safari-608-branch/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp 2019-08-14 01:19:28 UTC (rev 248654)
@@ -608,7 +608,7 @@
for (const auto& sessionStorageNamespace : m_sessionStorageNamespaces.values()) {
for (auto& origin : sessionStorageNamespace->origins())
- origins.add(origin);
+ origins.add(crossThreadCopy(origin));
}
RunLoop::main().dispatch([origins = WTFMove(origins), completionHandler = WTFMove(completionHandler)]() mutable {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
