Changeset ececad

Timestamp:

Feb 26, 2010, 10:01:30 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

031ec24

Parents:

edbe74

git-author:

Frederik Heber <heber@…> (02/26/10 09:59:15)

git-committer:

Frederik Heber <heber@…> (02/26/10 10:01:30)

Message:

MEMLEAK: TesselPoints and Vectors created during TesselationBoundaryTriangleTest::setUp() would not get free'd.

• Delete of triangle only destroys triangle, its lines and edges, not the TesselPoints
• New array *tesselpoints[3] introduced, which stores pointers to the created TesselPoints and free's them in tearDown().
• Allocated Vector's for the TesselPoints have to be deleted as well, as the TesselPoints normally only receive referencing pointers.

Location:

molecuilder/src/unittests

Files:

• tesselation_boundarytriangleunittest.cpp (modified) (2 diffs)
• tesselation_boundarytriangleunittest.hpp (modified) (1 diff)

molecuilder/src/unittests/tesselation_boundarytriangleunittest.cpp

@@ -35 +35 @@
 
   // create nodes
-  TesselPoint *Walker = NULL;
-  Walker = new TesselPoint;
-  Walker->node = new Vector(0., 0., 0.);
-  Walker->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
-  strcpy(Walker->Name, "1");
-  Walker->nr = 1;
-  points[0] = new BoundaryPointSet(Walker);
-  Walker = new TesselPoint;
-  Walker->node = new Vector(0., 1., 0.);
-  Walker->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
-  strcpy(Walker->Name, "2");
-  Walker->nr = 2;
-  points[1] = new BoundaryPointSet(Walker);
-  Walker = new TesselPoint;
-  Walker->node = new Vector(1., 0., 0.);
-  Walker->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
-  strcpy(Walker->Name, "3");
-  Walker->nr = 3;
-  points[2] = new BoundaryPointSet(Walker);
+  tesselpoints[0] = new TesselPoint;
+  tesselpoints[0]->node = new Vector(0., 0., 0.);
+  tesselpoints[0]->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
+  strcpy(tesselpoints[0]->Name, "1");
+  tesselpoints[0]->nr = 1;
+  points[0] = new BoundaryPointSet(tesselpoints[0]);
+  tesselpoints[1] = new TesselPoint;
+  tesselpoints[1]->node = new Vector(0., 1., 0.);
+  tesselpoints[1]->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
+  strcpy(tesselpoints[1]->Name, "2");
+  tesselpoints[1]->nr = 2;
+  points[1] = new BoundaryPointSet(tesselpoints[1]);
+  tesselpoints[2] = new TesselPoint;
+  tesselpoints[2] ->node = new Vector(1., 0., 0.);
+  tesselpoints[2] ->Name = Malloc<char>(3, "TesselationBoundaryTriangleTest::setUp - *Name");
+  strcpy(tesselpoints[2] ->Name, "3");
+  tesselpoints[2] ->nr = 3;
+  points[2] = new BoundaryPointSet(tesselpoints[2] );
 
   // create line
@@ -69 +68 @@
 {
   delete(triangle);
+  for (int i=0;i<3;++i) {
+    // TesselPoint does not delete its vector as it only got a reference
+    delete tesselpoints[i]->node;
+    delete tesselpoints[i];
+  }
   MemoryUsageObserver::purgeInstance();
   logger::purgeInstance();

molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp

@@ -35 +35 @@
       class BoundaryLineSet *lines[3];
       class BoundaryPointSet *points[3];
+      class TesselPoint *tesselpoints[3];
       LinkedNodes Corners;
 };