Title: [210699] branches/safari-603-branch/Source/WebKit2
- Revision
- 210699
- Author
- matthew_han...@apple.com
- Date
- 2017-01-12 22:09:59 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210596. rdar://problem/29757269
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210698 => 210699)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:09:56 UTC (rev 210698)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:09:59 UTC (rev 210699)
@@ -1,5 +1,24 @@
2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210596. rdar://problem/29757269
+
+ 2017-01-11 Anders Carlsson <ander...@apple.com>
+
+ REGRESSION: Crash in com.apple.WebKit: IPC::Connection::sendMessage(std::__1::unique_ptr<IPC::MachMessage, std::__1::default_delete<IPC::MachMessage> >) + 27
+ https://bugs.webkit.org/show_bug.cgi?id=165854
+ rdar://problem/29757269
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::sendMessage):
+ Add assertion.
+
+ (IPC::Connection::initializeSendSource):
+ Turns out the event handler can be called spuriously, so guard against that.
+
+2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210525. rdar://problem/29931470
2017-01-09 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (210698 => 210699)
--- branches/safari-603-branch/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-01-13 06:09:56 UTC (rev 210698)
+++ branches/safari-603-branch/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-01-13 06:09:59 UTC (rev 210699)
@@ -263,6 +263,7 @@
bool Connection::sendMessage(std::unique_ptr<MachMessage> message)
{
+ ASSERT(message);
ASSERT(!m_pendingOutgoingMachMessage);
// Send the message.
@@ -399,7 +400,9 @@
}
if (data & DISPATCH_MACH_SEND_POSSIBLE) {
- connection->sendMessage(WTFMove(connection->m_pendingOutgoingMachMessage));
+ // FIXME: Figure out why we get spurious DISPATCH_MACH_SEND_POSSIBLE events.
+ if (connection->m_pendingOutgoingMachMessage)
+ connection->sendMessage(WTFMove(connection->m_pendingOutgoingMachMessage));
connection->sendOutgoingMessages();
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
