Changeset ab7b5e7

Timestamp:

Jul 9, 2009, 11:38:33 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

438506

Parents:

bd86e8

Message:

Memory leak fix: ParseCommandLineOptions() and main() free'd mol twice or not at all

• ParseCommandLineOptions() free'd mol and periode on ExitFlag, however main() does this too
• main() exited after ParseCommandLineOptions() returnted with 0 or 1, free'ing nothing.
• Hence, ParseCommandLineOptions() does not delete, this is all done in main()
• the return value of ParseCommandLineOptions is now checked in a switch statement with free's and return

File:

• molecuilder/src/builder.cpp (modified) (4 diffs)

molecuilder/src/builder.cpp

@@ -1765 +1765 @@
                 if (SaveFlag)
                         SaveConfig(ConfigFileName, &configuration, periode, molecules);
-                if ((ExitFlag >= 1)) {
-                        delete(mol);
-                        delete(periode);
-                        return (ExitFlag);
-                }
         } else {        // no arguments, hence scan the elements db
                 if (periode->LoadPeriodentafel(configuration.databasepath))
@@ -1777 +1772 @@
                 configuration.RetrieveConfigPathAndName("main_pcp_linux");
         }
-        return(0);
+        return(ExitFlag);
 };
 
@@ -1798 +1793 @@
         // =========================== PARSE COMMAND LINE OPTIONS ====================================
         j = ParseCommandLineOptions(argc, argv, molecules, periode, configuration, ConfigFileName);
-        if (j == 1) return 0; // just for -v and -h options
-        if (j) return j;        // something went wrong
+        switch(j) {
+          case 0:  // something went wrong
+            delete(molecules); // also free's all molecules contained
+            delete(periode);
+            return j;
+            break;
+          case 1:  // just for -v and -h options
+            delete(molecules); // also free's all molecules contained
+            delete(periode);
+            return 0;
+            break;
+          default:
+            break;
+        }
 
         // General stuff
@@ -1893 +1900 @@
                 cout << Verbose(0) << "Saving of elements.db failed." << endl;
 
-        delete(molecules);
+        delete(molecules); // also free's all molecules contained
         delete(periode);
         return (0);