Merge remote-tracking branch 'origin/v80-bugfix'

CHANGELOG

@@ -173,6 +173,7 @@ Fixed bugs
 - ensure that delayed cutpool separation does not happen if enough cuts have been found already
 - fixed that a Gurobi or Mosek interface (LPI) could not be freed from a thread different than the one it was created in, which lead to problems when, e.g., using the concurrent optimizer
 - in cons_varbound if both variables are fixed, instead of propagating the constraint check the feasibility of the constraint since propagating can lead to unnecessary numerical troubles
+- fixed memory leak in branching rule "distribution"
 
 @section RN804 SCIP 8.0.4
 *************************

src/scip/branch_distribution.c

@@ -824,6 +824,12 @@ void branchruledataFreeArrays(
       SCIPfreeBlockMemoryArray(scip, &branchruledata->rowinfinitiesup, branchruledata->memsize);
       SCIPfreeBlockMemoryArray(scip, &branchruledata->rowinfinitiesdown, branchruledata->memsize);
 
+      SCIPfreeBlockMemoryArray(scip, &branchruledata->varfilterposs, branchruledata->varpossmemsize);
+      SCIPfreeBlockMemoryArray(scip, &branchruledata->varposs, branchruledata->varpossmemsize);
+      SCIPfreeBlockMemoryArray(scip, &branchruledata->updatedvars, branchruledata->varpossmemsize);
+      SCIPfreeBlockMemoryArray(scip, &branchruledata->currentubs, branchruledata->varpossmemsize);
+      SCIPfreeBlockMemoryArray(scip, &branchruledata->currentlbs, branchruledata->varpossmemsize);
+
       branchruledata->memsize = 0;
    }
 }
@@ -1070,9 +1076,6 @@ SCIP_DECL_BRANCHEXITSOL(branchExitsolDistribution)
    branchruledata = SCIPbranchruleGetData(branchrule);
    assert(branchruledata != NULL);
 
-   /* free row arrays when branch-and-bound data is freed */
-   branchruledataFreeArrays(scip, branchruledata);
-
    /* drop variable events at the end of branch and bound process (cannot be used after restarts, anyway) */
    if( branchruledata->varfilterposs != NULL)
    {
@@ -1088,8 +1091,11 @@ SCIP_DECL_BRANCHEXITSOL(branchExitsolDistribution)
       {
          SCIP_CALL( SCIPdropVarEvent(scip, vars[v], EVENT_DISTRIBUTION, branchruledata->eventhdlr, NULL, branchruledata->varfilterposs[v]) );
       }
-      SCIPfreeBlockMemoryArray(scip, &(branchruledata->varfilterposs), nvars);
    }
+
+   /* free row arrays when branch-and-bound data is freed */
+   branchruledataFreeArrays(scip, branchruledata);
+
    return SCIP_OKAY;
 }