Skip to content

Commit 44a1960

Browse files
committed
Merge remote-tracking branch 'origin/v9-minor'
2 parents 49e82f3 + 827a646 commit 44a1960

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ Fixed bugs
353353
- correct comparison conditions in checkRedundancySide() of cons_varbound.c to ensure pair redundancy
354354
- also for the initial LP solve force acceptance of Farkas row in SCIPlpGetDualfarkas() if all other means for obtaining a reliable Farkas proof have failed
355355
- avoid overwriting set cutoff flag in tightenCoefs(), preprocessConstraintPairs(), and applyFixings() of cons_varbound.c to reject infeasible solutions
356+
- fix memory leak in exprinterpret_cppad.cpp w.r.t. user expressions
356357

357358
Build system
358359
------------

src/scip/exprinterpret_cppad.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,6 +1651,10 @@ SCIP_RETCODE SCIPexprintFreeData(
16511651
SCIPfreeBlockMemoryArrayNull(scip, &(*exprintdata)->hesrowidxs, (*exprintdata)->hesnnz);
16521652
SCIPfreeBlockMemoryArrayNull(scip, &(*exprintdata)->hescolidxs, (*exprintdata)->hesnnz);
16531653

1654+
for( vector<atomic_userexpr*>::iterator it((*exprintdata)->userexprs.begin()); it != (*exprintdata)->userexprs.end(); ++it )
1655+
delete *it;
1656+
(*exprintdata)->userexprs.clear();
1657+
16541658
delete *exprintdata;
16551659
*exprintdata = NULL;
16561660

0 commit comments

Comments
 (0)