[XrdCl] various memory releated fixes.

xrootd · Dec 11, 2017 · a7e4e16 · a7e4e16
1 parent 2752b60
commit a7e4e16
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -543,7 +543,7 @@ namespace XrdCl
         //----------------------------------------------------------------------
         // Actual socket error error!
         //----------------------------------------------------------------------
-        sign->SetCursor( 0 );
+        if( sign ) sign->SetCursor( 0 );
         toWrite->SetCursor( 0 );
         return Status( stError, errSocketError, errno );
       }

diff --git a/src/XrdCl/XrdClCopy.cc b/src/XrdCl/XrdClCopy.cc
@@ -432,6 +432,8 @@ XrdCl::XRootDStatus GetDirList( XrdCl::FileSystem        *fs,
     }
   }
 
+  delete list;
+
   return XRootDStatus();
 }
 
@@ -467,7 +469,7 @@ XrdCpFile *IndexRemote( XrdCl::FileSystem *fs,
     current = new XrdCpFile( path.c_str(), badUrl );
     if( badUrl )
     {
-      // TODO release the memory !!!
+      // TODO release memory
       log->Error( AppMsg, "Bad URL: %s", current->Path );
       return 0;
     }
@@ -477,6 +479,8 @@ XrdCpFile *IndexRemote( XrdCl::FileSystem *fs,
     end           = current;
   }
 
+  delete dirList;
+
   return start.Next;
 }
 

diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
@@ -455,7 +455,6 @@ namespace XrdCl
       bool                    pDoRecoverRead;
       bool                    pDoRecoverWrite;
       bool                    pFollowRedirects;
-      bool                    pDoneInitOpen;
       bool                    pUseVirtRedirector;
 
       //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClXCpSrc.cc b/src/XrdCl/XrdClXCpSrc.cc
@@ -64,7 +64,7 @@ class ChunkHandler: public ResponseHandler
         *status = XRootDStatus( stError, errInternal );
       }
 
-      if( chunk->length != pSize && status->IsOK() ) // the file size on the server is different
+      if( status->IsOK() && chunk->length != pSize ) // the file size on the server is different
       {                                              // than the one specified in metalink file
         *status = XRootDStatus( stError, errDataError );
       }

diff --git a/src/XrdCl/XrdClZipArchiveReader.cc b/src/XrdCl/XrdClZipArchiveReader.cc
@@ -664,11 +664,15 @@ XRootDStatus ZipArchiveReaderImpl::Read( const std::string &filename, uint64_t r
     }
 
     memcpy( buffer, pBuffer + offset, size );
-    XRootDStatus *st   = new XRootDStatus();
-    AnyObject    *resp = new AnyObject();
-    ChunkInfo    *info = new ChunkInfo( relativeOffset, size, buffer );
-    resp->Set( info );
-    if( userHandler ) userHandler->HandleResponse( st, resp );
+
+    if( userHandler )
+    {
+      XRootDStatus *st   = new XRootDStatus();
+      AnyObject    *resp = new AnyObject();
+      ChunkInfo    *info = new ChunkInfo( relativeOffset, size, buffer );
+      resp->Set( info );
+      userHandler->HandleResponse( st, resp );
+    }
     return XRootDStatus();
   }