Bug 1242597 - Fix nsSocketTransport reference loop r=dragana

netwerk/base/nsSocketTransport2.cpp

@@ -473,7 +473,11 @@ nsSocketInputStream::AsyncWait(nsIInputStreamCallback *callback,
     bool hasError = false;
     {
         MutexAutoLock lock(mTransport->mLock);
-
+        if (mTransport->mState != nsSocketTransport::STATE_TRANSFERRING && NS_FAILED(mCondition)) {
+            SOCKET_LOG(("nsSocketInputStream::AsyncWait [this=%p] "
+                        "Not Transferring %X.\n", mTransport, mCondition));
+            return NS_OK;
+        }
         if (callback && target) {
             //
             // build event proxy
@@ -707,7 +711,12 @@ nsSocketOutputStream::AsyncWait(nsIOutputStreamCallback *callback,
 
     {
         MutexAutoLock lock(mTransport->mLock);
-
+        if (mTransport->mState != nsSocketTransport::STATE_TRANSFERRING && NS_FAILED(mCondition)) {
+            // do not take the callback reference if we will not call onOutputReady
+            SOCKET_LOG(("nsSocketOutputStream::AsyncWait [this=%p] mTransport=%p "
+                        "Not Transferring %X.\n",this, mTransport, mCondition));
+            return NS_OK;
+        }
         if (callback && target) {
             //
             // build event proxy

netwerk/base/nsSocketTransport2.h

@@ -187,7 +187,6 @@ private:
 
     enum {
         STATE_CLOSED,
-        STATE_IDLE,
         STATE_RESOLVING,
         STATE_CONNECTING,
         STATE_TRANSFERRING