Skip to content

Commit 8da10cd

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 8032df9 + 4ae0494 commit 8da10cd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Fixed bugs
7070
- fixed call of SCIPcreateConsBasicSOCNonlinear() with coefs being NULL, and fixed check for offsets being finite
7171
- avoid crash when initial IIS solve fails while reporting errors explicitly
7272
- fixed failure in nl writing on big endian machines
73+
- correct memory reallocation in storeSubproblemMasterVar() of benders.c to avoid freeing errors
7374

7475
Miscellaneous
7576
-------------

src/scip/benders.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,8 +1481,7 @@ SCIP_RETCODE storeSubproblemMasterVar(
14811481
int newsize;
14821482

14831483
newsize = SCIPsetCalcMemGrowSize(set, benders->nsubmastervars[probnumber] + 1);
1484-
SCIP_ALLOC( BMSreallocBlockMemoryArray(SCIPblkmem(set->scip), &benders->submastervars[probnumber],
1485-
benders->submastervarssize[probnumber], newsize) );
1484+
SCIP_ALLOC( BMSreallocMemoryArray(&benders->submastervars[probnumber], newsize) ); /*lint !e866*/
14861485

14871486
benders->submastervarssize[probnumber] = newsize;
14881487
}

0 commit comments

Comments
 (0)