Bug 1136140 - wss inside https proxy null deref. r=hurley, a=lsblakk
authorPatrick McManus <mcmanus@ducksong.com>
Mon, 09 Mar 2015 16:44:34 -0400
changeset 250354 b8c7154fab60
parent 250353 97c57043b3fc
child 250355 7949e470a547
push id4555
push userryanvm@gmail.com
push date2015-03-11 19:14 +0000
treeherdermozilla-beta@7949e470a547 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershurley, lsblakk
bugs1136140
milestone37.0
Bug 1136140 - wss inside https proxy null deref. r=hurley, a=lsblakk
netwerk/protocol/http/nsHttpConnection.cpp
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -1115,19 +1115,19 @@ nsHttpConnection::TakeTransport(nsISocke
     mSocketTransport->SetSecurityCallbacks(nullptr);
     mSocketTransport->SetEventSink(nullptr, nullptr);
 
     // The nsHttpConnection will go away soon, so if there is a TLS Filter
     // being used (e.g. for wss CONNECT tunnel from a proxy connected to
     // via https) that filter needs to take direct control of the
     // streams
     if (mTLSFilter) {
-        nsCOMPtr<nsISupports> ref1(mSocketIn);
-        nsCOMPtr<nsISupports> ref2(mSocketOut);
-        mTLSFilter->newIODriver(mSocketIn, mSocketOut,
+        nsCOMPtr<nsIAsyncInputStream>  ref1(mSocketIn);
+        nsCOMPtr<nsIAsyncOutputStream> ref2(mSocketOut);
+        mTLSFilter->newIODriver(ref1, ref2,
                                 getter_AddRefs(mSocketIn),
                                 getter_AddRefs(mSocketOut));
         mTLSFilter = nullptr;
     }
 
     mSocketTransport.forget(aTransport);
     mSocketIn.forget(aInputStream);
     mSocketOut.forget(aOutputStream);