Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 614958 - Don't release the socket transport's event sink while we're holding a lock, since it can result in retrying to obtain the same lock again, which causes a deadlock; r=biesi,bsmedberg a=blocking-beta8+ landed on a CLOSED TREE

Browse Source
This commit is contained in:
Ehsan Akhgari 2010-12-02 16:29:09 -05:00
parent bc2ff22c6c
commit d12271f37a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -1612,6 +1612,12 @@ nsSocketTransport::OnSocketDetached(PRFileDesc *fd)
// finally, release our reference to the socket (must do this within
// the transport lock) possibly closing the socket. Also release our
// listeners to break potential refcount cycles.
// We should be careful not to release mEventSink while we're locked,
// because releasing it might require acquiring the lock again, so
// we just null out mEventSink while we're holding the lock, and let
// ourEventSink's destuctor take care of destroying it if needed.
nsCOMPtr<nsITransportEventSink> ourEventSink;
{
nsAutoLock lock(mLock);
if (mFD) {
@ -1627,7 +1633,7 @@ nsSocketTransport::OnSocketDetached(PRFileDesc *fd)
// round. That would lead e.g. to a broken certificate exception page.
if (NS_FAILED(mCondition)) {
mCallbacks = nsnull;
mEventSink = nsnull;
mEventSink.swap(ourEventSink);
}
}
}