Fix CIDs 350452, 323467 (missing_lock)

This commit is contained in:
Alexey Rybalchenko 2020-01-14 11:54:25 +01:00 committed by Dennis Klein
parent 38bb14e556
commit a1e0814a92

View File

@ -133,6 +133,10 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan, const string& newName)
FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan) FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
{ {
{
lock_guard<mutex> lock1(fMtx);
lock_guard<mutex> lock2(chan.fMtx);
fTransportFactory = nullptr; fTransportFactory = nullptr;
fTransportType = chan.fTransportType; fTransportType = chan.fTransportType;
fSocket = nullptr; fSocket = nullptr;
@ -153,6 +157,7 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
fMultipart = chan.fMultipart; fMultipart = chan.fMultipart;
fModified = chan.fModified; fModified = chan.fModified;
fReset = false; fReset = false;
}
return *this; return *this;
} }