Changeset 499cea

Timestamp:

Aug 28, 2012, 5:34:09 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

2d0bba

Parents:

4dfef04

Message:

FIX: Fixing bad_alloc in setOutputBaseName().

• setOutputBaseName() checks for prefix of filename (stuff before dot). If no dot is present, the size of the char buffer depends on the address of the basename_source. This lead to sporadic bad_allocs.
• Now, we create the temporary basename in MPQCJob::Work() with a ".in" suffix.
• Moreover, setOutputBaseName() checks whether a dot is present and if not just takes the length of the given filename.

File:

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

src/bin/mpqc/mpqc.cc

@@ -451 +451 @@
   if (output) basename_source = output;
   else        basename_source = input;
-  int nfilebase = (int) (::strrchr(basename_source, '.') - basename_source);
+  const char *baseprefix = ::strrchr(basename_source, '.');
+  int nfilebase = 1;
+  if (baseprefix == NULL) {
+    std::cerr << "setOutputBaseName() - ERROR: basename_source "
+        << basename_source << " contains no dot (.)." << std::endl;
+    nfilebase = ::strlen(basename_source);
+  } else
+    nfilebase = (int) (baseprefix - basename_source);
   char *basename = new char[nfilebase + 1];
   strncpy(basename, basename_source, nfilebase);
@@ -1844 +1851 @@
   std::ifstream test;
   do {
-    char filename_template[] = "mpqc_temp_XXXXXX";
+    char filename_template[] = "mpqc_temp_XXXXXX.in";
     output = mktemp(filename_template);
     test.open(output);
@@ -1893 +1900 @@
   const char *generic_input = 0;
   getInputFileNames(object_input, generic_input, options, optind, argc, argv);
-  const char *input;
+  const char *input = 0;
   if (object_input) input = object_input;
   if (generic_input) input = generic_input;