Changeset 5821

Timestamp:

Sep 28, 2009, 3:56:30 PM (15 years ago)

Author:

rgrieder

Message:

Fixed 3 memory leaks (one of them was a true even a true one )

• XMLPortObjectContainers as XMLPort event containers were not deleted in the identifier
• EventContainers were not deleted in the BaseObject
• ClassTreeMask clean() operation only erased redundant subnodes instead of deleting them as well

Location:

code/branches/core5/src/libraries/core

Files:

• BaseObject.cc (modified) (2 diffs)
• ClassTreeMask.cc (modified) (1 diff)
• Identifier.cc (modified) (1 diff)

code/branches/core5/src/libraries/core/BaseObject.cc

@@ -99 +99 @@
                 it->first->removeEvent(this);
 
+            for (std::map<std::string, EventContainer*>::const_iterator it = this->eventContainers_.begin(); it != this->eventContainers_.end(); ++it)
+                delete it->second;
+
             if (this->functorSetMainState_)
                 delete this->functorSetMainState_;
@@ -146 +149 @@
 
                 XMLPortClassObjectContainer<BaseObject, BaseObject>* container = 0;
-                container = (XMLPortClassObjectContainer<BaseObject, BaseObject>*)(this->getIdentifier()->getXMLPortEventContainer(sectionname));
+                container = static_cast<XMLPortClassObjectContainer<BaseObject, BaseObject>*>(this->getIdentifier()->getXMLPortEventContainer(sectionname));
                 if (!container)
                 {

code/branches/core5/src/libraries/core/ClassTreeMask.cc

@@ -488 +488 @@
 
                 // Remove the redundant subnode from the current node
+                delete (*it);
                 node->subnodes_.erase(it++);
             }

code/branches/core5/src/libraries/core/Identifier.cc

@@ -88 +88 @@
         for (std::map<std::string, XMLPortObjectContainer*>::iterator it = this->xmlportObjectContainers_.begin(); it != this->xmlportObjectContainers_.end(); ++it)
             delete (it->second);
+        for (std::map<std::string, XMLPortObjectContainer*>::iterator it = this->xmlportEventContainers_.begin(); it != this->xmlportEventContainers_.end(); ++it)
+            delete (it->second);
     }