Changeset 8d3df9 for src/bin/mpqc/mpqc.cc

Timestamp:

Mar 11, 2013, 11:33:01 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

889c27

Parents:

e00146

git-author:

Frederik Heber <heber@…> (03/06/13 13:58:13)

git-committer:

Frederik Heber <heber@…> (03/11/13 23:33:01)

Message:

MEMFIX: Fixed some memory leaks in mainFunction().

File:

• src/bin/mpqc/mpqc.cc (modified) (4 diffs)

src/bin/mpqc/mpqc.cc

@@ -1789 +1789 @@
     size_t gather_region = findTimerRegion(nregion, region_names, "gather");
     size_t mpqc_region = findTimerRegion(nregion, region_names, "mpqc");
+    delete[] region_names;
 
     // get timings
@@ -1881 +1882 @@
   // create unique, temporary name and check whether it exists
   const char *output = NULL;
+  char *tempfilename = NULL;
   {
     std::ifstream test;
     do {
+      if (output != NULL) // free buffer from last round
+        delete output;
       char filename_template[] = "mpqc_temp_XXXXXX\0";
       char filename_suffix[] = ".in\0";
-      char *tempfilename = (char *) malloc ( (strlen(filename_template)+strlen(filename_suffix)+2)*(sizeof(char)));
+      tempfilename = (char *) malloc ( (strlen(filename_template)+strlen(filename_suffix)+2)*(sizeof(char)));
       strncpy(tempfilename, mktemp(filename_template), strlen(filename_template));
       tempfilename[strlen(filename_template)] = '\0';
@@ -1893 +1897 @@
       //free(tempfilename); // don't free! output takes over pointer!
       test.open(output);
-    } while (test.good());
+    } while (test.good()); // test whether file does not(!) exist
     test.close();
   }
@@ -1900 +1904 @@
 // now call work horse
   mainFunction(grp, values, output, input, generic_input, in_char_array, argc, argv, data);
-//  delete[] in_char_array;
-
-//  if (output != 0) {
-//    ExEnv::set_out(&cout);
-//    delete outstream;
-//  }
-//  delete[] argv;
-//
+
+  //delete[] in_char_array; // is deleted in mainFunction()
+  if (output != 0) {
+    free(tempfilename);
+  }
+  delete[] argv;
+  grp = NULL;
+
   // place into returnstream
   std::stringstream returnstream;