Title: [173676] branches/safari-600.1-branch/Source/WebCore
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173675 => 173676)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-16 22:37:15 UTC (rev 173675)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-16 22:53:36 UTC (rev 173676)
@@ -1,3 +1,20 @@
+2014-09-16 Dana Burkart <[email protected]>
+
+ Merge r173635
+
+ 2014-09-15 Alexey Proskuryakov <[email protected]>
+
+ Crash when logging in to optionshouse.com
+ https://bugs.webkit.org/show_bug.cgi?id=136834
+
+ Reviewed by Anders Carlsson.
+
+ No test, because I couldn't make one. I don't have a way to reproduce first-hand.
+
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::readStreamCallback):
+ (WebCore::SocketStreamHandle::writeStreamCallback):
+
2014-09-12 Lucas Forschler <[email protected]>
Merge r173584
Modified: branches/safari-600.1-branch/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (173675 => 173676)
--- branches/safari-600.1-branch/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-09-16 22:37:15 UTC (rev 173675)
+++ branches/safari-600.1-branch/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-09-16 22:53:36 UTC (rev 173676)
@@ -424,6 +424,10 @@
{
SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
ASSERT_UNUSED(stream, stream == handle->m_readStream.get());
+ // Workaround for <rdar://problem/17727073>. Keeping this below the assertion as we'd like better steps to reproduce this.
+ if (!handle->m_readStream)
+ return;
+
#if PLATFORM(WIN)
callOnMainThreadAndWait([&] {
handle->readStreamCallback(type);
@@ -438,6 +442,10 @@
{
SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
ASSERT_UNUSED(stream, stream == handle->m_writeStream.get());
+ // This wasn't seen happening in practice, yet it seems like it could, due to symmetry with read stream callback.
+ if (!handle->m_writeStream)
+ return;
+
#if PLATFORM(WIN)
callOnMainThreadAndWait([&] {
handle->writeStreamCallback(type);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
