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

scipopt · Jan 15, 2024 · 96ac528 · 96ac528
2 parents 3ed6d90 + d8f9fec
commit 96ac528
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/scip/lp.c b/src/scip/lp.c
@@ -12842,7 +12842,7 @@ SCIP_RETCODE SCIPlpSolveAndEval(
                   SCIPsetIsLT(set, objval, lp->cutoffbound - getFiniteLooseObjval(lp, set, prob)) )
                {
                   SCIP_Bool simplex = (lp->lastlpalgo == SCIP_LPALGO_PRIMALSIMPLEX || lp->lastlpalgo == SCIP_LPALGO_DUALSIMPLEX);
-                  if( !(lperror) && (fastmip > 0) && simplex )
+                  if( !(*lperror) && (fastmip > 0) && simplex )
                   {
                      fastmip = 0;
                      SCIP_CALL( lpSolve(lp, set, messagehdlr, stat, prob, SCIP_LPALGO_DUALSIMPLEX, -1, -1,

diff --git a/src/scip/scip_solve.c b/src/scip/scip_solve.c
@@ -3332,6 +3332,8 @@ SCIP_RETCODE SCIPfreeTransform(
    SCIP*                 scip                /**< SCIP data structure */
    )
 {
+   assert(scip != NULL);
+
    SCIP_CALL( SCIPcheckStage(scip, "SCIPfreeTransform", TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE) );
 
    /* release variables and constraints captured by reoptimization */