Changeset 2350

Timestamp:

Nov 27, 2017 5:36:22 AM (3 years ago)

Author:

forrest

Message:

out leaks

Location:

stable/2.9/Cbc/src

Files:

• CbcHeuristicLocal.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (2 diffs)

stable/2.9/Cbc/src/CbcHeuristicLocal.cpp

@@ -1662 +1662 @@
         }
     }
+    delete [] fixed;
     int returnCode = smallBranchAndBound(solver, numberNodes_, betterSolution,
                                          solutionValue,

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -323 +323 @@
     presolvedModel->solver()->setColSolution(bestSolution);
     //presolvedModel->setBestSolution(bestSolution,numberColumns,objectiveValue);
+    delete [] bestSolution;
   }
 }
@@ -6907 +6908 @@
                                   if (numberSolutions>1) {
                                     for (int iSolution=numberSolutions-1;iSolution>=0;iSolution--) {
-                                      model_.setBestSolution(babModel_->savedSolution(iSolution),
-                                                             model_.solver()->getNumCols(),
+                                      const double * savedSolution =babModel_->savedSolution(iSolution);
+                                      int numberColumns=model_.solver()->getNumCols();
+                                      // only set if dimensions OK
+                                      int numberBabColumns=static_cast<int>
+                                        (savedSolution[-2]);
+                                      if (numberBabColumns>=numberColumns)
+                                        model_.setBestSolution(savedSolution,
+                                                             numberColumns,
                                                              babModel_->savedSolutionObjective(iSolution));
                                     }