BUG#19318 valgrind: memory leak in ndb_mgmd

clean up after ConfigValuesFactory

2 files changed, 8 insertions, 1 deletions

diff --git a/ndb/include/util/ConfigValues.hpp b/ndb/include/util/ConfigValues.hpp
index 457488e3c42..8dfb3c83df3 100644
--- a/ndb/include/util/ConfigValues.hpp
+++ b/ndb/include/util/ConfigValues.hpp
@@ -96,6 +96,7 @@ public:
 public:
   ConfigValuesFactory(Uint32 keys = 50, Uint32 data = 10); // Initial
   ConfigValuesFactory(ConfigValues * m_cfg);        //
+  ~ConfigValuesFactory();
 
   ConfigValues * m_cfg;
   ConfigValues * getConfigValues();
diff --git a/ndb/src/common/util/ConfigValues.cpp b/ndb/src/common/util/ConfigValues.cpp
index 5c4b17c73ca..ae4fbfd2f71 100644
--- a/ndb/src/common/util/ConfigValues.cpp
+++ b/ndb/src/common/util/ConfigValues.cpp
@@ -294,6 +294,12 @@ ConfigValuesFactory::ConfigValuesFactory(ConfigValues * cfg){
   }
 }
 
+ConfigValuesFactory::~ConfigValuesFactory()
+{
+  if(m_cfg)
+    free(m_cfg);
+}
+
 ConfigValues *
 ConfigValuesFactory::create(Uint32 keys, Uint32 data){
   Uint32 sz = sizeof(ConfigValues);
@@ -528,7 +534,7 @@ ConfigValuesFactory::extractCurrentSection(const ConfigValues::ConstIterator & c
     }
   }
   
-  ConfigValues * ret = fac->m_cfg;
+  ConfigValues * ret = fac->getConfigValues();
   delete fac;
   return ret;
 }