Merge pull request #1665 from jkho/5589-memory-leak-rejistry++

5589 Fix memory leaks in Rejistry++

rejistry++/src/RegistryHive.h

@@ -48,6 +48,10 @@ namespace Rejistry {
          */
         virtual REGFHeader * getHeader() const = 0;
 
+        /**
+         * Virtual destructor to prevent memory leak
+         */
+        virtual ~RegistryHive() {}
     };
 };
 

rejistry++/src/RegistryHiveBuffer.cpp

@@ -47,7 +47,10 @@ namespace Rejistry {
     }
 
     RegistryKey * RegistryHiveBuffer::getRoot() const {
-        return new RegistryKey(getHeader()->getRootNKRecord());
+        REGFHeader *header = getHeader();
+        Rejistry::NKRecord *nkRecord = header->getRootNKRecord();
+        delete header;
+        return new RegistryKey(nkRecord);
     }
 
     REGFHeader * RegistryHiveBuffer::getHeader() const {

rejistry++/src/RegistryKey.cpp

@@ -74,19 +74,34 @@ namespace Rejistry {
      */
     RegistryKey::RegistryKeyPtrList RegistryKey::getSubkeyList() const {
         std::vector<RegistryKey *> subkeys;
-        NKRecord::NKRecordPtrList nkRecordList = _nk->getSubkeyList()->getSubkeys();
+        SubkeyListRecord::SubkeyListRecordPtr subkeyListRecordPtr = _nk->getSubkeyList();
+        NKRecord::NKRecordPtrList nkRecordList = subkeyListRecordPtr->getSubkeys();
         NKRecord::NKRecordPtrList::iterator it;
         for (it = nkRecordList.begin(); it != nkRecordList.end(); ++it) {
             subkeys.push_back(new RegistryKey(*it));
         }
+        delete subkeyListRecordPtr;
         return subkeys;
     }
 
+
+    size_t RegistryKey::getSubkeyListSize() const {
+        std::vector<RegistryKey *> subkeys;
+        SubkeyListRecord::SubkeyListRecordPtr subkeyListRecordPtr = _nk->getSubkeyList();
+        NKRecord::NKRecordPtrList nkRecordList = subkeyListRecordPtr->getSubkeys();
+        delete subkeyListRecordPtr;
+        return nkRecordList.size();
+    }
+
+
     /**
      * Caller is responsible for freeing returned key
      */
     RegistryKey::RegistryKeyPtr RegistryKey::getSubkey(const std::wstring& name) const {
-        return new RegistryKey(_nk->getSubkeyList()->getSubkey(name));
+        SubkeyListRecord::SubkeyListRecordPtr subkeyListRecordPtr = _nk->getSubkeyList();
+        Rejistry::NKRecord *nkRecord = subkeyListRecordPtr->getSubkey(name);
+        delete subkeyListRecordPtr;
+        return new RegistryKey(nkRecord);
     }
 
     /**
@@ -102,10 +117,21 @@ namespace Rejistry {
         return values;
     }
 
+
+    size_t RegistryKey::getValueListSize() const {
+        Rejistry::ValueListRecord *valueListRecord = _nk->getValueList();
+        size_t size = valueListRecord->getValuesSize();
+        delete valueListRecord;
+        return size;
+    }
+
     /**
      * Caller is responsible for freeing returned value
      */
     RegistryValue::RegistryValuePtr RegistryKey::getValue(const std::wstring& name) const {
-        return new RegistryValue(_nk->getValueList()->getValue(name));
+        Rejistry::ValueListRecord *valueListRecord = _nk->getValueList();
+        Rejistry::VKRecord *vkRecord = valueListRecord->getValue(name);
+        delete valueListRecord;
+        return new RegistryValue(vkRecord);
     }
 };

rejistry++/src/RegistryKey.h

@@ -73,6 +73,13 @@ namespace Rejistry {
          */
         RegistryKeyPtrList getSubkeyList() const;
 
+        /**
+        * Get number of subkeys for the current registry key.
+        * @returns number of subkeys.
+        * @throws RegistryParseException on error.
+        */
+        size_t getSubkeyListSize() const;
+
         /**
          * Get the subkey with the given name.
          * @param name ASCII name of the subkey of retrieve.
@@ -88,6 +95,13 @@ namespace Rejistry {
          */
         RegistryValue::RegistryValuePtrList getValueList() const;
 
+        /**
+        * Get number of values for the current key.
+        * @returns Number of values.
+        * @throws RegistryParseException on error.
+        */
+        size_t getValueListSize() const;
+
         /**
          * Get the value for the given name.
          * @param name ASCII name of the value to retrieve.

rejistry++/src/ValueData.h

@@ -68,6 +68,11 @@ namespace Rejistry {
             _type = type;
         }
         
+        ~ValueData() {
+            if (_buf)
+                delete _buf;
+        }
+
         VALUE_TYPES getValueType() const { return _type; };
 
         /**

rejistry++/src/ValueListRecord.h

@@ -61,6 +61,11 @@ namespace Rejistry {
          */
         VKRecord::VKRecordPtr getValue(const std::wstring& name) const;
 
+        /**
+        * @returns The ValueListRecord size
+        */
+        size_t getValuesSize() const { return _numValues; }
+
     private:
         static const uint16_t VALUE_LIST_OFFSET = 0x00;