Changeset 2377 for stable

Timestamp:

Aug 26, 2018 3:27:55 PM (3 years ago)

Author:

unxusr

Message:

leak in CbcMain1

File:

• stable/2.9/Cbc/src/CbcSolver.cpp (modified) (5 diffs)

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -1342 +1342 @@
     int statistics_nprocessedrows = 0, statistics_nprocessedcols = 0;
     std::string statistics_result;
-    int * statistics_number_cuts = NULL;
+    int *statistics_number_cuts = NULL;
     const char ** statistics_name_generators = NULL;
     int statistics_number_generators = 0;
@@ -7061 +7061 @@
 
                                 numberGenerators = babModel_->numberCutGenerators();
+                                if (statistics_number_cuts)
+                                    delete[] statistics_number_cuts;
                                 statistics_number_cuts = new int [numberGenerators];;
                                 statistics_number_generators = numberGenerators;
@@ -7093 +7095 @@
                                     << CoinMessageEol;
                                 }
+
 #ifdef COIN_DEVELOP
                                 printf("%d solutions found by heuristics\n",
@@ -9143 +9146 @@
                                     statistics_nprocessedrows, statistics_nprocessedcols);
                             for (int i = 0; i < statistics_number_generators; i++)
-                                fprintf(fp, ",%d", statistics_number_cuts[i]);
+                                fprintf(fp, ",%d", (statistics_number_cuts!=NULL) ? statistics_number_cuts[i] : 0 );
                             fprintf(fp, ",");
                             for (int i = 1; i < argc; i++) {
@@ -9978 +9981 @@
     }
 #endif
-    delete [] statistics_number_cuts;
+    if (statistics_number_cuts != NULL)
+        delete [] statistics_number_cuts;
     delete [] statistics_name_generators;
     // By now all memory should be freed