Title: [130468] trunk/Source/WebKit/chromium
- Revision
- 130468
- Author
- ba...@chromium.org
- Date
- 2012-10-04 23:39:21 -0700 (Thu, 04 Oct 2012)
Log Message
[Chromium] Improve SocketStreamHandle::send() stability
https://bugs.webkit.org/show_bug.cgi?id=98459
Reviewed by Yuta Kitamura.
Avoid null dereference in SocketStreamHandleInternal::send().
No changes in behavior.
* src/SocketStreamHandle.cpp:
(WebCore::SocketStreamHandleInternal::send):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (130467 => 130468)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-05 06:24:56 UTC (rev 130467)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-05 06:39:21 UTC (rev 130468)
@@ -1,3 +1,16 @@
+2012-10-04 Kenichi Ishibashi <ba...@chromium.org>
+
+ [Chromium] Improve SocketStreamHandle::send() stability
+ https://bugs.webkit.org/show_bug.cgi?id=98459
+
+ Reviewed by Yuta Kitamura.
+
+ Avoid null dereference in SocketStreamHandleInternal::send().
+ No changes in behavior.
+
+ * src/SocketStreamHandle.cpp:
+ (WebCore::SocketStreamHandleInternal::send):
+
2012-10-04 Dirk Pranke <dpra...@chromium.org>
Chromium DEPS roll r160281:160322
Modified: trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp (130467 => 130468)
--- trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2012-10-05 06:24:56 UTC (rev 130467)
+++ trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2012-10-05 06:39:21 UTC (rev 130468)
@@ -72,7 +72,13 @@
int SocketStreamHandleInternal::send(const char* data, int len)
{
LOG(Network, "send len=%d", len);
- ASSERT(m_socket);
+ // FIXME: |m_socket| should not be null here, but it seems that there is the
+ // case. We should figure out such a path and fix it rather than checking
+ // null here.
+ if (!m_socket) {
+ LOG(Network, "m_socket is null when sending. It should not be.");
+ return 0;
+ }
if (m_pendingAmountSent + len >= m_maxPendingSendAllowed)
len = m_maxPendingSendAllowed - m_pendingAmountSent - 1;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
