Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[network] Hold mutex when accessing mSecurityInfo.

master
Fedor 2021-02-07 17:33:42 +02:00
parent f508c50268
commit 3571ed761a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netwerk/protocol/http/nsHttpTransaction.cpp
View File

@ -765,7 +765,10 @@ nsHttpTransaction::ReadSegments(nsAHttpSegmentReader *reader,
if (!mConnected && !m0RTTInProgress) {
mConnected = true;
mConnection->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
nsCOMPtr<nsISupports> info;
mConnection->GetSecurityInfo(getter_AddRefs(info));
MutexAutoLock lock(mLock);
mSecurityInfo = std::move(info);
}
mDeferredSendProgress = false;
@ -1314,7 +1317,10 @@ nsHttpTransaction::Restart()
seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
// clear old connection state...
mSecurityInfo = nullptr;
{
MutexAutoLock lock(mLock);
mSecurityInfo = nullptr;
}
if (mConnection) {
if (!mReuseOnRestart) {
mConnection->DontReuse();
@ -2489,7 +2495,10 @@ nsHttpTransaction::Finish0RTT(bool aRestart, bool aAlpnChanged /* ignored */)
} else if (!mConnected) {
// this is code that was skipped in ::ReadSegments while in 0RTT
mConnected = true;
mConnection->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
nsCOMPtr<nsISupports> info;
mConnection->GetSecurityInfo(getter_AddRefs(info));
MutexAutoLock lock(mLock);
mSecurityInfo = std::move(info);
}
return NS_OK;
}