[XrdCl] Avoid race in postmaster QueryTransport

xrootd · Jul 10, 2023 · 496a044 · 496a044
1 parent b6c02a5
commit 496a044
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/XrdCl/XrdClPostMaster.cc b/src/XrdCl/XrdClPostMaster.cc
@@ -245,11 +245,15 @@ namespace XrdCl
                                      AnyObject &result )
   {
     XrdSysRWLockHelper scopedLock( pImpl->pDisconnectLock );
-    PostMasterImpl::ChannelMap::iterator it =
-        pImpl->pChannelMap.find( url.GetChannelId() );
-    if( it == pImpl->pChannelMap.end() )
-      return Status( stError, errInvalidOp );
-    Channel *channel = it->second;
+    Channel *channel = 0;
+    {
+      XrdSysMutexHelper scopedLock2( pImpl->pChannelMapMutex );
+      PostMasterImpl::ChannelMap::iterator it =
+          pImpl->pChannelMap.find( url.GetChannelId() );
+      if( it == pImpl->pChannelMap.end() )
+        return Status( stError, errInvalidOp );
+      channel = it->second;
+    }
 
     if( !channel )
       return Status( stError, errNotSupported );