Skip to content

Commit f6304ae

Browse files
committed
Merge remote-tracking branch 'origin/v91-bugfix' into v9-minor
2 parents 2777553 + ce239a7 commit f6304ae

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Fixed bugs
5252
- fix bug in separator aggregation that caused incorrect terminations when for an integral objective the objective limit was set to a fractional value
5353
- fix bug in memory management of doublelex matrices where indices were set beyond array bounds
5454
- store relevance flags in consdataTightenCoefs() of cons_linear.c to avoid dropping variables unintentionally due to numerical changes
55+
- fix possible segmentation fault when resetting original variable bounds after abnormal termination
5556

5657
Performance improvements
5758
------------------------

src/scip/var.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6930,7 +6930,7 @@ SCIP_RETCODE varProcessChgLbGlobal(
69306930

69316931
/* issue bound change event */
69326932
assert(SCIPvarIsTransformed(var) == (var->eventfilter != NULL));
6933-
if( var->eventfilter != NULL )
6933+
if( SCIPsetGetStage(set) != SCIP_STAGE_PROBLEM && var->eventfilter != NULL )
69346934
{
69356935
SCIP_CALL( varEventGlbChanged(var, blkmem, set, lp, branchcand, eventqueue, oldbound, newbound) );
69366936
}
@@ -7105,7 +7105,7 @@ SCIP_RETCODE varProcessChgUbGlobal(
71057105

71067106
/* issue bound change event */
71077107
assert(SCIPvarIsTransformed(var) == (var->eventfilter != NULL));
7108-
if( var->eventfilter != NULL )
7108+
if( SCIPsetGetStage(set) != SCIP_STAGE_PROBLEM && var->eventfilter != NULL )
71097109
{
71107110
SCIP_CALL( varEventGubChanged(var, blkmem, set, lp, branchcand, eventqueue, oldbound, newbound) );
71117111
}
@@ -7699,7 +7699,7 @@ SCIP_RETCODE varProcessChgLbLocal(
76997699

77007700
/* issue bound change event */
77017701
assert(SCIPvarIsTransformed(var) == (var->eventfilter != NULL));
7702-
if( var->eventfilter != NULL )
7702+
if( SCIPsetGetStage(set) != SCIP_STAGE_PROBLEM && var->eventfilter != NULL )
77037703
{
77047704
SCIP_CALL( varEventLbChanged(var, blkmem, set, lp, branchcand, eventqueue, oldbound, newbound) );
77057705
}
@@ -7866,7 +7866,7 @@ SCIP_RETCODE varProcessChgUbLocal(
78667866

78677867
/* issue bound change event */
78687868
assert(SCIPvarIsTransformed(var) == (var->eventfilter != NULL));
7869-
if( var->eventfilter != NULL )
7869+
if( SCIPsetGetStage(set) != SCIP_STAGE_PROBLEM && var->eventfilter != NULL )
78707870
{
78717871
SCIP_CALL( varEventUbChanged(var, blkmem, set, lp, branchcand, eventqueue, oldbound, newbound) );
78727872
}

0 commit comments

Comments
 (0)