[XrdCl] Fix memory leak (hostList) on statuful msg t/o.

xrootd · Nov 23, 2021 · 61259cd · 61259cd
1 parent e1a6e15
commit 61259cd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/XrdCl/XrdClMessageUtils.cc b/src/XrdCl/XrdClMessageUtils.cc
@@ -111,7 +111,13 @@ namespace XrdCl
       msgHandler->SetLoadBalancer( sendParams.loadBalancer );
 
     HostList *list = 0;
-    list = new HostList();
+    if( sendParams.hostList )
+    {
+      list = sendParams.hostList;
+      sendParams.hostList = nullptr;
+    }
+    else
+      list = new HostList();
     list->push_back( url );
     msgHandler->SetHostList( list );
 

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc
@@ -1683,9 +1683,9 @@ namespace XrdCl
         pSidMgr->ReleaseSID( req->header.streamid );
     }
 
-    HostList *hosts = pHosts;
+    HostList *hosts = pHosts.release();
     if( !finalrsp )
-      pHosts = new HostList( *hosts );
+      pHosts.reset( new HostList( *hosts ) );
 
     pResponseHandler->HandleResponseWithHosts( status, response, hosts );
 
@@ -2965,7 +2965,7 @@ namespace XrdCl
 
     pResponseHandler->HandleResponseWithHosts( new XRootDStatus(),
                                                resp,
-                                               pHosts );
+                                               pHosts.release() );
     delete this;
 
     return;

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.hh b/src/XrdCl/XrdClXRootDMsgHandler.hh
@@ -140,7 +140,6 @@ namespace XrdCl
         pExpiration( 0 ),
         pRedirectAsAnswer( false ),
         pOksofarAsAnswer( false ),
-        pHosts( 0 ),
         pHasLoadBalancer( false ),
         pHasSessionId( false ),
         pChunkList( 0 ),
@@ -230,7 +229,6 @@ namespace XrdCl
         pResponseHandler        = reinterpret_cast<ResponseHandler*>( 0xDEADBEEF );
         pPostMaster             = reinterpret_cast<PostMaster*>( 0xDEADBEEF );
         pLFileHandler           = reinterpret_cast<LocalFileHandler*>( 0xDEADBEEF );
-        pHosts                  = reinterpret_cast<HostList*>( 0xDEADBEEF );
         pChunkList              = reinterpret_cast<ChunkList*>( 0xDEADBEEF );
         pEffectiveDataServerUrl = reinterpret_cast<URL*>( 0xDEADBEEF );
 
@@ -380,8 +378,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       void SetHostList( HostList *hostList )
       {
-        delete pHosts;
-        pHosts = hostList;
+        pHosts.reset( hostList );
       }
 
       //------------------------------------------------------------------------
@@ -689,7 +686,7 @@ namespace XrdCl
       time_t                          pExpiration;
       bool                            pRedirectAsAnswer;
       bool                            pOksofarAsAnswer;
-      HostList                       *pHosts;
+      std::unique_ptr<HostList>       pHosts;
       bool                            pHasLoadBalancer;
       HostInfo                        pLoadBalancer;
       bool                            pHasSessionId;