Changeset 173635 in webkit

Timestamp:

Sep 15, 2014 3:52:47 PM (10 years ago)

Author:

ap@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/SocketStreamHandleCFNet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-15  Alexey Proskuryakov  <ap@apple.com>
+
+        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-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

@@ -425 +425 @@
     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([&] {
@@ -439 +443 @@
     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([&] {