Fixed some memory leaks in ExpDict.cc.

davyw · davyw · commit a1d6b25e7571 · 2012-04-05T20:40:11.000+02:00
* TypeDescriptor::_where_rules never got destroyed.
* Where_rule__list, Uniqueness_rule__set and Global_rule__set never
  destroyed their content.
* Inverse_attributeList never destroyed it's content.
diff --git a/src/clstepcore/ExpDict.cc b/src/clstepcore/ExpDict.cc
@@ -1025,6 +1025,8 @@ Where_rule__list::Where_rule__list( int defaultSize ) {
 }
 
 Where_rule__list::~Where_rule__list() {
+    Clear();
+
     delete _buf;
 }
 
@@ -1102,6 +1104,9 @@ int Where_rule__list::Count() {
 }
 
 void Where_rule__list::Clear() {
+    for ( int i = 0; i < _count ; i ++ ) {
+        delete _buf[i];
+    }
     _count = 0;
 }
 
@@ -1130,6 +1135,8 @@ Uniqueness_rule__set::Uniqueness_rule__set( int defaultSize ) {
 }
 
 Uniqueness_rule__set::~Uniqueness_rule__set() {
+    Clear();
+
     delete _buf;
 }
 
@@ -1207,6 +1214,9 @@ int Uniqueness_rule__set::Count() {
 }
 
 void Uniqueness_rule__set::Clear() {
+    for ( int i = 0; i < _count; i ++ ) {
+        delete _buf[i];
+    }
     _count = 0;
 }
 
@@ -1247,6 +1257,7 @@ Global_rule__set::Global_rule__set( int defaultSize ) {
 }
 
 Global_rule__set::~Global_rule__set() {
+    Clear();
     delete _buf;
 }
 
@@ -1324,6 +1335,9 @@ int Global_rule__set::Count() {
 }
 
 void Global_rule__set::Clear() {
+    for ( int i = 0; i < _count; i ++ ) {
+        delete _buf[i];
+    }
     _count = 0;
 }
 
diff --git a/src/clstepcore/ExpDict.inline.cc b/src/clstepcore/ExpDict.inline.cc
@@ -123,6 +123,9 @@ AttrDescLinkNode::AttrDescLinkNode() {
 }
 
 AttrDescLinkNode::~AttrDescLinkNode() {
+    if ( _attrDesc ) {
+        delete _attrDesc;
+    }
 }
 
 AttrDescItr::AttrDescItr( const AttrDescriptorList & adList ) : adl( adList ) {
@@ -143,6 +146,13 @@ Inverse_attributeList::Inverse_attributeList() {
 }
 
 Inverse_attributeList::~Inverse_attributeList() {
+    Inverse_attributeLinkNode *node;
+
+    node = ( Inverse_attributeLinkNode* ) head;
+    while ( node ) {
+        delete node->Inverse_attr();
+        node = ( Inverse_attributeLinkNode* ) node->NextNode();
+    }
 }
 
 Inverse_attributeLinkNode * Inverse_attributeList::AddNode( Inverse_attribute * ad ) {
@@ -211,6 +221,12 @@ TypeDescriptor::TypeDescriptor
        _where_rules( 0 ) {
 }
 
+TypeDescriptor::~TypeDescriptor() {
+    if ( _where_rules ) {
+        delete _where_rules;
+    }
+}
+
 /**
  * Determines the current name of this.  Normally, this is simply _name.
  * If "schnm" is set to a value, however, then this function becomes a

Original file line number	Diff line number	Diff line change
`@@ -1025,6 +1025,8 @@ Where_rule__list::Where_rule__list( int defaultSize ) {`
`1025`	`1025`	`}`
`1026`	`1026`
`1027`	`1027`	`Where_rule__list::~Where_rule__list() {`
	`1028`	`+ Clear();`
	`1029`	`+`
`1028`	`1030`	`delete _buf;`
`1029`	`1031`	`}`
`1030`	`1032`
`@@ -1102,6 +1104,9 @@ int Where_rule__list::Count() {`
`1102`	`1104`	`}`
`1103`	`1105`
`1104`	`1106`	`void Where_rule__list::Clear() {`
	`1107`	`+ for ( int i = 0; i < _count ; i ++ ) {`
	`1108`	`+ delete _buf[i];`
	`1109`	`+ }`
`1105`	`1110`	`_count = 0;`
`1106`	`1111`	`}`
`1107`	`1112`
`@@ -1130,6 +1135,8 @@ Uniqueness_rule__set::Uniqueness_rule__set( int defaultSize ) {`
`1130`	`1135`	`}`
`1131`	`1136`
`1132`	`1137`	`Uniqueness_rule__set::~Uniqueness_rule__set() {`
	`1138`	`+ Clear();`
	`1139`	`+`
`1133`	`1140`	`delete _buf;`
`1134`	`1141`	`}`
`1135`	`1142`
`@@ -1207,6 +1214,9 @@ int Uniqueness_rule__set::Count() {`
`1207`	`1214`	`}`
`1208`	`1215`
`1209`	`1216`	`void Uniqueness_rule__set::Clear() {`
	`1217`	`+ for ( int i = 0; i < _count; i ++ ) {`
	`1218`	`+ delete _buf[i];`
	`1219`	`+ }`
`1210`	`1220`	`_count = 0;`
`1211`	`1221`	`}`
`1212`	`1222`
`@@ -1247,6 +1257,7 @@ Global_rule__set::Global_rule__set( int defaultSize ) {`
`1247`	`1257`	`}`
`1248`	`1258`
`1249`	`1259`	`Global_rule__set::~Global_rule__set() {`
	`1260`	`+ Clear();`
`1250`	`1261`	`delete _buf;`
`1251`	`1262`	`}`
`1252`	`1263`
`@@ -1324,6 +1335,9 @@ int Global_rule__set::Count() {`
`1324`	`1335`	`}`
`1325`	`1336`
`1326`	`1337`	`void Global_rule__set::Clear() {`
	`1338`	`+ for ( int i = 0; i < _count; i ++ ) {`
	`1339`	`+ delete _buf[i];`
	`1340`	`+ }`
`1327`	`1341`	`_count = 0;`
`1328`	`1342`	`}`
`1329`	`1343`