Bug 1319973 - tls proxy null in nshttpconnection::onsocketwritable after timer r=hurley
authorPatrick McManus <mcmanus@ducksong.com>
Mon, 28 Nov 2016 11:05:33 -0500
changeset 324715 334758dabe03d652b633736f71c8544c9c9d19cc
parent 324714 e6459d80bf245d1f5e2f46bda884878548d58126
child 324716 23990c75a5e36eb5ecbb551cfcbcb8ae152c764d
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewershurley
bugs1319973
milestone53.0a1
Bug 1319973 - tls proxy null in nshttpconnection::onsocketwritable after timer r=hurley
netwerk/protocol/http/nsHttpConnection.cpp
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -1709,16 +1709,19 @@ nsHttpConnection::OnSocketWritable()
             rv = mProxyConnectStream->ReadSegments(ReadFromStream, this,
                                                    nsIOService::gDefaultSegmentSize,
                                                    &transactionBytes);
         } else if (!EnsureNPNComplete(rv, transactionBytes)) {
             if (NS_SUCCEEDED(rv) && !transactionBytes &&
                 NS_SUCCEEDED(mSocketOutCondition)) {
                 mSocketOutCondition = NS_BASE_STREAM_WOULD_BLOCK;
             }
+        } else if (!mTransaction) {
+            rv = NS_ERROR_FAILURE;
+            LOG(("  No Transaction In OnSocketWritable\n"));
         } else {
 
             // for non spdy sessions let the connection manager know
             if (!mReportedSpdy) {
                 mReportedSpdy = true;
                 MOZ_ASSERT(!mEverUsedSpdy);
                 gHttpHandler->ConnMgr()->ReportSpdyConnection(this, false);
             }