[XrdEc] Small bugfixes.

xrootd · Jan 4, 2021 · 8724e20 · 8724e20
1 parent 87196db
commit 8724e20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/XrdCl/XrdClZipArchive.cc b/src/XrdCl/XrdClZipArchive.cc
@@ -287,7 +287,6 @@ namespace XrdCl
     size += eocd->eocdSize ;
     size += eocd->cdSize;
     // then create zip64eocd & zip64eocdl if necessary
-    std::unique_ptr<ZIP64_EOCD>  zip64eocd;
     std::unique_ptr<ZIP64_EOCDL> zip64eocdl;
     if( eocd->useZip64 )
     {

diff --git a/src/XrdEc/XrdEcReader.hh b/src/XrdEc/XrdEcReader.hh
@@ -305,7 +305,8 @@ namespace XrdEc
                      delete[] buffer;
                    }
                    // close the file if necessary (we don't really care about the result)
-                   if( file->IsOpen() ) file->Close( nullptr );
+                   if( file->IsOpen() )
+                     XrdCl::Async( XrdCl::Close( *file ) >> [file]( XrdCl::XRootDStatus& ){ } );
                  } );
       }
 

diff --git a/src/XrdZip/XrdZipCDFH.hh b/src/XrdZip/XrdZipCDFH.hh
@@ -106,10 +106,11 @@ namespace XrdZip
       size_t i = 0;
       while( bufferSize > 0 )
       {
-        if( bufferSize < cdfhBaseSize ) throw bad_data();
+        if( bufferSize < sizeof( uint32_t ) ) throw bad_data();
         // check the signature
         uint32_t signature = to<uint32_t>( buffer );
-        if( signature != cdfhSign ) throw bad_data();
+        if( signature != cdfhSign )
+          return std::make_tuple( std::move( cdvec ), std::move( cdmap ) );
         // parse the record
         std::unique_ptr<CDFH> cdfh( new CDFH( buffer ) );
         if( bufferSize < cdfh->cdfhSize ) throw bad_data();