Title: [227829] branches/safari-605-branch/Source/WebKit
- Revision
- 227829
- Author
- [email protected]
- Date
- 2018-01-30 10:51:28 -0800 (Tue, 30 Jan 2018)
Log Message
Cherry-pick r227751. rdar://problem/37019491
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227828 => 227829)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-30 18:51:27 UTC (rev 227828)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-30 18:51:28 UTC (rev 227829)
@@ -1,5 +1,23 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227751. rdar://problem/37019491
+
+ 2018-01-29 Chris Dumez <[email protected]>
+
+ Make sure we do not re-enter Webcore during StorageToWebProcessConnection::EstablishSWServerConnection Sync IPC
+ https://bugs.webkit.org/show_bug.cgi?id=182256
+ <rdar://problem/36689233>
+
+ Reviewed by Simon Fraser.
+
+ Make sure we do not re-enter Webcore during StorageToWebProcessConnection::EstablishSWServerConnection Sync IPC as
+ this can lead to crashes such as the one in <rdar://problem/36689233>.
+
+ * WebProcess/Storage/WebSWClientConnection.cpp:
+ (WebKit::WebSWClientConnection::WebSWClientConnection):
+
+2018-01-30 Jason Marcell <[email protected]>
+
Cherry-pick r227710. rdar://problem/37019457
2018-01-26 Megan Gardner <[email protected]>
Modified: branches/safari-605-branch/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp (227828 => 227829)
--- branches/safari-605-branch/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp 2018-01-30 18:51:27 UTC (rev 227828)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp 2018-01-30 18:51:28 UTC (rev 227829)
@@ -53,7 +53,7 @@
, m_connection(connection)
, m_swOriginTable(makeUniqueRef<WebSWOriginTable>())
{
- bool result = sendSync(Messages::StorageToWebProcessConnection::EstablishSWServerConnection(sessionID), Messages::StorageToWebProcessConnection::EstablishSWServerConnection::Reply(m_identifier));
+ bool result = sendSync(Messages::StorageToWebProcessConnection::EstablishSWServerConnection(sessionID), Messages::StorageToWebProcessConnection::EstablishSWServerConnection::Reply(m_identifier), Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply);
ASSERT_UNUSED(result, result);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
