Title: [202939] trunk/Source/WebKit2
- Revision
- 202939
- Author
- [email protected]
- Date
- 2016-07-07 15:42:43 -0700 (Thu, 07 Jul 2016)
Log Message
Fix crash when sending failure message to closed WebProcess
https://bugs.webkit.org/show_bug.cgi?id=159526
<rdar://problem/26767037>
Reviewed by Brady Eidson.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didFailLoading):
Check to see if there is a connection before using it to send a message.
Sometimes it was null.
I think this could be tested if we had real network loading from TestWebKitAPI
by cancelling slow loads and closing WebProcesses around the same time, but no such infrastructure exists yet.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202938 => 202939)
--- trunk/Source/WebKit2/ChangeLog 2016-07-07 22:37:31 UTC (rev 202938)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-07 22:42:43 UTC (rev 202939)
@@ -1,5 +1,20 @@
2016-07-07 Alex Christensen <[email protected]>
+ Fix crash when sending failure message to closed WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=159526
+ <rdar://problem/26767037>
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didFailLoading):
+ Check to see if there is a connection before using it to send a message.
+ Sometimes it was null.
+ I think this could be tested if we had real network loading from TestWebKitAPI
+ by cancelling slow loads and closing WebProcesses around the same time, but no such infrastructure exists yet.
+
+2016-07-07 Alex Christensen <[email protected]>
+
Use SocketProvider to create WebSocketChannels
https://bugs.webkit.org/show_bug.cgi?id=158776
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (202938 => 202939)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-07 22:37:31 UTC (rev 202938)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-07 22:42:43 UTC (rev 202939)
@@ -405,8 +405,8 @@
if (isSynchronous()) {
m_synchronousLoadData->error = error;
sendReplyToSynchronousRequest(*m_synchronousLoadData, nullptr);
- } else
- send(Messages::WebResourceLoader::DidFailResourceLoad(error));
+ } else if (auto* connection = messageSenderConnection())
+ connection->send(Messages::WebResourceLoader::DidFailResourceLoad(error), 0, 0);
cleanup();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
