Merge pull request #48040 from makortel/fixStorageMemoryLeaks

Fix memory leaks in TStorageFactoryFile and StorageAccountProxy

Author: cmsbuild

IOPool/TFileAdaptor/interface/TStorageFactoryFile.h

@@ -55,8 +55,6 @@ class TStorageFactoryFile : public TFile {
 
   Bool_t ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);
 
-  void releaseStorage() { get_underlying_safe(storage_).release(); }
-
   TStorageFactoryFile(void);
 
   edm::propagate_const<std::unique_ptr<edm::storage::Storage>> storage_;  //< Real underlying storage

IOPool/TFileAdaptor/src/TStorageFactoryFile.cc

@@ -564,7 +564,7 @@ Int_t TStorageFactoryFile::SysClose(Int_t /* fd */) {
 
   if (storage_) {
     storage_->close();
-    releaseStorage();
+    get_underlying_safe(storage_).reset();
   }
 
   stats.tick();

Utilities/StorageFactory/interface/StorageAccountProxy.h

@@ -40,7 +40,7 @@ namespace edm::storage {
     void close(void) override;
 
   protected:
-    void releaseStorage() { get_underlying_safe(m_baseStorage).release(); }
+    void resetStorage() { get_underlying_safe(m_baseStorage).reset(); }
 
     edm::propagate_const<std::unique_ptr<Storage>> m_baseStorage;
 

Utilities/StorageFactory/src/StorageAccountProxy.cc

@@ -16,7 +16,7 @@ StorageAccountProxy::StorageAccountProxy(const std::string &storageClass, std::u
 
 StorageAccountProxy::~StorageAccountProxy() {
   StorageAccount::Stamp stats(StorageAccount::counter(m_token, StorageAccount::Operation::destruct));
-  releaseStorage();
+  resetStorage();
   stats.tick();
 }