Title: [111656] trunk/Source/WebKit/chromium
- Revision
- 111656
- Author
- ba...@chromium.org
- Date
- 2012-03-22 00:25:45 -0700 (Thu, 22 Mar 2012)
Log Message
[Chromium] Should check m_socket in SocketStreamHandleInternal::close()
https://bugs.webkit.org/show_bug.cgi?id=81860
Reviewed by Kent Tamura.
m_socket could be NULL if WebSocket::resume() is called after SocketStreamHandle::didClose() is called.
This could happen when the page shows a popup dialog (by using alert()) immediately after closing an WebSocket object.
* src/SocketStreamHandle.cpp:
(WebCore::SocketStreamHandleInternal::close): Ensures m_socket is not NULL.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111655 => 111656)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-22 07:15:18 UTC (rev 111655)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-22 07:25:45 UTC (rev 111656)
@@ -1,3 +1,16 @@
+2012-03-22 Kenichi Ishibashi <ba...@chromium.org>
+
+ [Chromium] Should check m_socket in SocketStreamHandleInternal::close()
+ https://bugs.webkit.org/show_bug.cgi?id=81860
+
+ Reviewed by Kent Tamura.
+
+ m_socket could be NULL if WebSocket::resume() is called after SocketStreamHandle::didClose() is called.
+ This could happen when the page shows a popup dialog (by using alert()) immediately after closing an WebSocket object.
+
+ * src/SocketStreamHandle.cpp:
+ (WebCore::SocketStreamHandleInternal::close): Ensures m_socket is not NULL.
+
2012-03-21 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r111616.
Modified: trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp (111655 => 111656)
--- trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2012-03-22 07:15:18 UTC (rev 111655)
+++ trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2012-03-22 07:25:45 UTC (rev 111656)
@@ -92,7 +92,8 @@
void SocketStreamHandleInternal::close()
{
LOG(Network, "close");
- m_socket->close();
+ if (m_socket)
+ m_socket->close();
}
void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
