Properly delete elements before removing their pointers.

Delete statements have been added to the remove() method(s) so that the elements are properly deleted before the pointers are erased.

Properly delete elements before removing their pointers.
Delete statements have been added to the remove() method(s) so that the elements are properly deleted before the pointers are erased.
Jürgen Knödlseder
1 parent 17039a06
Showing 4 changed files with 15 additions and 0 deletions
src/fits/GFits.cpp
src/obs/GObservations.cpp
src/sky/GSkyRegions.cpp
src/xml/GXmlNode.cpp
@@ -857,6 +857,9 @@ void GFits::remove(const int&amp; extno)
         throw GException::invalid_argument(G_REMOVE1, msg);
     }
  
+    // Delete HDU
+    if (m_hdu[extno] != NULL) delete m_hdu[extno];
+
     // Erase HDU from FITS file
     m_hdu.erase(m_hdu.begin() + extno);
  
@@ -400,6 +400,9 @@ void GObservations::remove(const int&amp; index)
     }
     #endif
  
+    // Delete observation
+    delete m_obs[index];
+
     // Erase observation component from container
     m_obs.erase(m_obs.begin() + index);
  
@@ -542,6 +542,9 @@ void GSkyRegions::remove(const int&amp; index)
     }
     #endif
  
+    // Delete region
+    delete m_regions[index];
+
     // Erase region component from container
     m_regions.erase(m_regions.begin() + index);
  
@@ -570,6 +573,9 @@ void GSkyRegions::remove(const std::string&amp; name)
         throw GException::invalid_argument(G_REMOVE2, name);
     }
  
+    // Delete region
+    delete m_regions[index];
+
     // Erase region component from container
     m_regions.erase(m_regions.begin() + index);
  
@@ -354,6 +354,9 @@ void GXmlNode::remove(const int&amp; index)
     }
     #endif
  
+    // Delete node
+    delete m_nodes[index];
+    
     // Erase child node from container
     m_nodes.erase(m_nodes.begin() + index);