Fix memory leaks (NanoComp#1839)

* Fix memory leaks * Add kkg to authors list
mochen4 · Feb 16, 2022 · 5197f83 · 5197f83
1 parent 005ef90
commit 5197f83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -16,3 +16,4 @@ Robin Dunn <[email protected]>
 Ian Williamson <[email protected]>
 Andreas Hoenselaar <[email protected]>
 Ben Bartlett <[email protected]>
+Krishna Gadepalli <[email protected]>
diff --git a/src/GDSIIgeom.cpp b/src/GDSIIgeom.cpp
@@ -144,15 +144,16 @@ geometric_object_list get_GDSII_prisms(material_type material, const char *GDSII
   for (int np = 0; np < num_prisms; np++) {
     dVec polygon = polygons[np];
     int num_vertices = polygon.size() / 2;
-    vector3 *vertices = new vector3[num_vertices];
+    auto vertices = std::make_unique<vector3[]>(num_vertices);
     for (int nv = 0; nv < num_vertices; nv++) {
       vertices[nv].x = polygon[2 * nv + 0];
       vertices[nv].y = polygon[2 * nv + 1];
       vertices[nv].z = zmin;
     }
     double height = zmax - zmin;
     vector3 zaxis = {0, 0, 1};
-    prisms.items[np] = make_prism(material, vertices, num_vertices, height, zaxis);
+    prisms.items[np] =
+        make_prism(material, vertices.get(), num_vertices, height, zaxis);
   }
   return prisms;
 }
@@ -169,7 +170,7 @@ geometric_object get_GDSII_prism(material_type material, const char *GDSIIFile,
   dVec polygon = get_polygon(GDSIIFile, Text, Layer);
 
   int num_vertices = polygon.size() / 2;
-  vector3 *vertices = new vector3[num_vertices];
+  auto vertices = std::make_unique<vector3[]>(num_vertices);
   for (int nv = 0; nv < num_vertices; nv++) {
     vertices[nv].x = polygon[2 * nv + 0];
     vertices[nv].y = polygon[2 * nv + 1];
@@ -178,7 +179,7 @@ geometric_object get_GDSII_prism(material_type material, const char *GDSIIFile,
 
   double height = zmax - zmin;
   vector3 zaxis = {0, 0, 1};
-  return make_prism(material, vertices, num_vertices, height, zaxis);
+  return make_prism(material, vertices.get(), num_vertices, height, zaxis);
 }
 
 geometric_object get_GDSII_prism(material_type material, const char *GDSIIFile, int Layer,

diff --git a/src/meepgeom.cpp b/src/meepgeom.cpp
@@ -716,7 +716,8 @@ geom_epsilon::geom_epsilon(const geom_epsilon &geps1) {
 geom_epsilon::~geom_epsilon() {
   int length = geometry.num_items;
   for (int i = 0; i < length; i++){
-    delete geometry.items[i].material;
+    material_free((material_type)geometry.items[i].material);
+    geometric_object_destroy(geometry.items[i]);
   }
   delete[] geometry.items;
   unset_volume();