resolve memory leak

Kei18 · Feb 12, 2021 · c2a82c3 · c2a82c3
1 parent 9b48e60
commit c2a82c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/visualizer/include/mapfplan.hpp b/visualizer/include/mapfplan.hpp
@@ -12,4 +12,6 @@ struct MAPFPlan {
   Config config_s;        // start configuration
   Config config_g;        // goal configuration
   Configs transitions;    // plan
+
+  ~MAPFPlan() { delete G; }
 };
diff --git a/visualizer/include/ofApp.hpp b/visualizer/include/ofApp.hpp
@@ -35,7 +35,7 @@ class ofApp : public ofBaseApp {
 
 public:
   ofApp(MAPFPlan* _P);
-  ~ofApp() {};
+  ~ofApp();
   void setup();
   void update();
   void draw();

diff --git a/visualizer/src/main.cpp b/visualizer/src/main.cpp
@@ -17,12 +17,10 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 
-  MAPFPlan* solution = new MAPFPlan;
+  MAPFPlan* solution = new MAPFPlan;  // deleted in ofApp destructor
   readSetResult(argv[1], solution);
   ofSetupOpenGL(100, 100, OF_WINDOW);
   ofRunApp(new ofApp(solution));
-
-  delete solution;
   return 0;
 }
 
@@ -63,7 +61,7 @@ void readSetResult(const std::string& result_file, MAPFPlan* plan)
   while (getline(file, line)) {
     // read map
     if (std::regex_match(line, results, r_map)) {
-      plan->G = new Grid(results[1].str());
+      plan->G = new Grid(results[1].str());  // deleted in destructor of MAPFPlan
       continue;
     }
     // set agent num

diff --git a/visualizer/src/ofApp.cpp b/visualizer/src/ofApp.cpp
@@ -13,6 +13,11 @@ ofApp::ofApp(MAPFPlan* _P): P(_P)
   line_mode = LINE_MODE::STRAIGHT;
 }
 
+ofApp::~ofApp()
+{
+  delete P;
+}
+
 void ofApp::setup()
 {
   // setup size