Merge pull request #2476 from vgteam/fix-map-memory-leak

resolve memory leaks in mapper (resolves #2421)
vgteam · Sep 23, 2019 · 94c19a1 · 94c19a1 · adamnovak · Sep 23, 2019
2 parents ed86372 + 134916c
commit 94c19a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/cluster.cpp b/src/cluster.cpp
@@ -3521,9 +3521,9 @@ bdsg::HashGraph cluster_subgraph_containing(const HandleGraph& base, const Align
         backward_max_dist.push_back(aligner->longest_detectable_gap(aln, mem.begin)
                                     + (mem.begin - aln.sequence().begin()));
     }
-    auto cluster_graph = new bdsg::HashGraph();
-    algorithms::extract_containing_graph(&base, cluster_graph, positions, forward_max_dist, backward_max_dist);
-    return *cluster_graph;
+    auto cluster_graph = bdsg::HashGraph();
+    algorithms::extract_containing_graph(&base, &cluster_graph, positions, forward_max_dist, backward_max_dist);
+    return cluster_graph;
 }
 
 bdsg::HashGraph cluster_subgraph_walk(const HandleGraph& base, const Alignment& aln, const vector<vg::MaximalExactMatch>& mems, double expansion) {

diff --git a/src/subcommand/map_main.cpp b/src/subcommand/map_main.cpp
@@ -1217,6 +1217,11 @@ int main_map(int argc, char** argv) {
 
     cout.flush();
 
+    // clean up our mappers
+    for (uint64_t i = 0; i < mapper.size(); ++i) {
+        delete mapper[i];
+    }
+
     return 0;
 
 }