Changeset e00146

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

8d3df9

Parents:

7d8854

git-author:

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

git-committer:

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

Message:

FIX: invalid strncat's and alikes in MPQCJob::Work().

File:

• src/bin/mpqc/mpqc.cc (modified) (1 diff)

src/bin/mpqc/mpqc.cc

@@ -1881 +1881 @@
   // create unique, temporary name and check whether it exists
   const char *output = NULL;
-  std::ifstream test;
-  do {
-    char filename_template[] = "mpqc_temp_XXXXXX";
-    char filename_suffix[] = ".in";
-    char *tempfilename = (char *) malloc ( (strlen(filename_template)+strlen(filename_suffix))*(sizeof(char)));
-    strncpy(tempfilename, mktemp(filename_template), strlen(filename_template));
-    strncat(tempfilename, filename_suffix, strlen(filename_suffix));  
-    output = tempfilename;
-    test.open(output);
-  } while (test.good());
+  {
+    std::ifstream test;
+    do {
+      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)));
+      strncpy(tempfilename, mktemp(filename_template), strlen(filename_template));
+      tempfilename[strlen(filename_template)] = '\0';
+      strncat(tempfilename, filename_suffix, strlen(filename_suffix));
+      output = tempfilename;
+      //free(tempfilename); // don't free! output takes over pointer!
+      test.open(output);
+    } while (test.good());
+    test.close();
+  }
   // put info how to sample the density into MPQCData
   MPQCData data(grid);