Delete buffers when the buffer manager is deleted. Fixes #414

xrootd · Jan 20, 2017 · 98628b1 · 98628b1
1 parent af1b984
commit 98628b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Xrd/XrdBuffer.cc b/src/Xrd/XrdBuffer.cc
@@ -41,7 +41,6 @@
 #include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysTimer.hh"
 #include "Xrd/XrdBuffer.hh"
-//??#include "Xrd/XrdBuffXL.hh"
 #include "XrdBuffXL.hh"
 
 #define XRD_TRACE XrdTrace->
@@ -107,6 +106,23 @@ XrdBuffManager::XrdBuffManager(XrdSysError *lP, XrdOucTrace *tP, int minrst) :
    memset(static_cast<void *>(bucket), 0, sizeof(bucket));
 }
 
+/******************************************************************************/
+/*                            D e s t r u c t o r                             */
+/******************************************************************************/
+
+XrdBuffManager::~XrdBuffManager()
+{
+   XrdBuffer *bP;
+
+   for (int i = 0; i < XRD_BUCKETS; i++)
+       {while((bP = bucket[i].bnext))
+             {bucket[i].bnext = bP->next;
+              delete bP;
+             }
+        bucket[i].numbuf = 0;
+       }
+}
+
 /******************************************************************************/
 /*                                  I n i t                                   */
 /******************************************************************************/

diff --git a/src/Xrd/XrdBuffer.hh b/src/Xrd/XrdBuffer.hh
@@ -93,7 +93,7 @@ int         Stats(char *buff, int blen, int do_sync=0);
 
             XrdBuffManager(XrdSysError *lP, XrdOucTrace *tP, int minrst=20*60);
 
-           ~XrdBuffManager() {} // The buffmanager is never deleted
+           ~XrdBuffManager();   // The buffmanager is never deleted
 
 private: