XrdApps::JCache: fix memory leaks found with valgrind

cern-eos · Jun 14, 2024 · ae53d20 · ae53d20
1 parent 3811a38
commit ae53d20
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/XrdApps/XrdClJCachePlugin/file/CacheStats.hh b/src/XrdApps/XrdClJCachePlugin/file/CacheStats.hh
@@ -53,6 +53,7 @@ struct CacheStats {
     struct timeval now;
     gettimeofday(&now, nullptr);
     startTime = now.tv_sec + now.tv_usec / 1000000.0;
+    dumperInterval=0;
   }
 
   ~CacheStats() {

diff --git a/src/XrdApps/XrdClJCachePlugin/file/XrdClJCacheFile.cc b/src/XrdApps/XrdClJCachePlugin/file/XrdClJCacheFile.cc
@@ -192,10 +192,10 @@ XRootDStatus JCacheFile::Stat(bool force, ResponseHandler *handler,
 
   if (pFile) {
     if (!force && mOpenAsync) {
-      // let's create a stat response using the cache
-      AnyObject *obj = new AnyObject();
-      std::string id = pUrl;
       if (sEnableJournalCache && AttachForRead() && mOpenAsync) {
+        // let's create a stat response using the cache
+        AnyObject *obj = new AnyObject();
+        std::string id = pUrl;
         auto statInfo = new StatInfo(id, pJournal->getHeaderFileSize(), 0, pJournal->getHeaderMtime());
         obj->Set(statInfo);
         XRootDStatus *ret_st = new XRootDStatus(XRootDStatus(stOK, 0));
@@ -577,10 +577,12 @@ bool JCacheFile::AttachForRead() {
           mLog->Error(1, "JCache : failed to attach to cache file: %s",
                       pJournalPath.c_str());
           mAttachedForRead = true;
+          delete sinfo;
           return false;
         } else {
           mLog->Info(1, "JCache : attached to cache file: %s",
                      pJournalPath.c_str());
+          delete sinfo;
         }
       }
     }

diff --git a/src/XrdApps/XrdClJCachePlugin/handler/XrdClJCachePgReadHandler.hh b/src/XrdApps/XrdClJCachePlugin/handler/XrdClJCachePgReadHandler.hh
@@ -63,6 +63,7 @@ public:
       }
     }
     handler->HandleResponse(pStatus, pResponse);
+    delete this;
   }
 
   XrdCl::ResponseHandler *handler;

diff --git a/src/XrdApps/XrdClJCachePlugin/handler/XrdClJCacheReadHandler.hh b/src/XrdApps/XrdClJCachePlugin/handler/XrdClJCacheReadHandler.hh
@@ -63,6 +63,7 @@ public:
       }
     }
     handler->HandleResponse(pStatus, pResponse);
+    delete this;
   }
 
   XrdCl::ResponseHandler *handler;