Title: [225469] trunk/Source/WebCore
- Revision
- 225469
- Author
- [email protected]
- Date
- 2017-12-03 21:40:48 -0800 (Sun, 03 Dec 2017)
Log Message
WebSocketChannel should ensure its client is live when calling it in error case
https://bugs.webkit.org/show_bug.cgi?id=180285
Patch by Youenn Fablet <[email protected]> on 2017-12-03
Reviewed by Darin Adler.
No observable change of behavior.
This makes it consistent with other calls of didReceiveMessageError.
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::fail):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225468 => 225469)
--- trunk/Source/WebCore/ChangeLog 2017-12-04 03:34:44 UTC (rev 225468)
+++ trunk/Source/WebCore/ChangeLog 2017-12-04 05:40:48 UTC (rev 225469)
@@ -1,3 +1,16 @@
+2017-12-03 Youenn Fablet <[email protected]>
+
+ WebSocketChannel should ensure its client is live when calling it in error case
+ https://bugs.webkit.org/show_bug.cgi?id=180285
+
+ Reviewed by Darin Adler.
+
+ No observable change of behavior.
+ This makes it consistent with other calls of didReceiveMessageError.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::fail):
+
2017-12-03 Alexey Proskuryakov <[email protected]>
WebArchiveResourceWebResourceHandler leaks when pasting
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (225468 => 225469)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-12-04 03:34:44 UTC (rev 225468)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-12-04 05:40:48 UTC (rev 225469)
@@ -232,7 +232,8 @@
m_deflateFramer.didFail();
m_hasContinuousFrame = false;
m_continuousFrameData.clear();
- m_client->didReceiveMessageError();
+ if (m_client)
+ m_client->didReceiveMessageError();
if (m_handle && !m_closed)
m_handle->disconnect(); // Will call didCloseSocketStream() but maybe not synchronously.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes