Merge remote-tracking branch 'origin/v9-minor'

Author: scip-ci

src/scip/cons_nonlinear.c

@@ -8718,6 +8718,7 @@ SCIP_RETCODE bilinTermAddAuxExpr(
    }
    else
    {
+      assert(term->aux.exprs != NULL);
       term->aux.exprs[pos]->underestimate |= auxexpr->underestimate;
       term->aux.exprs[pos]->overestimate  |= auxexpr->overestimate;
    }

src/scip/heur.c

@@ -1736,6 +1736,7 @@ SCIP_RETCODE SCIPvariablegraphBreadthFirst(
    if( vargraph == NULL )
    {
       SCIP_CALL( SCIPvariableGraphCreate(scip, &vargraph, FALSE, 1.0, NULL) );
+      assert(vargraph != NULL);
       localvargraph = TRUE;
    }
    else

src/scip/heur_padm.c

@@ -1268,6 +1268,8 @@ static SCIP_DECL_HEUREXEC(heurExecPADM)
       SCIP_VAR* var;
       const char* vname;
 
+      assert(linkvartoblocks[i].indexes != NULL);
+
       vname = SCIPvarGetName(linkvars[i]);
       k = 0;
       for( b = 0; b < problem->nblocks; b++ )

src/scip/heur_twoopt.c

@@ -674,6 +674,7 @@ SCIP_RETCODE innerPresolve(
    assert(vars != NULL);
    assert(nvars >= 2);
    assert(nblocks != NULL);
+   assert(maxblocksize != NULL);
    assert(nblockvars != NULL);
    assert(blockstart != NULL);
    assert(blockend != NULL);
@@ -691,6 +692,7 @@ SCIP_RETCODE innerPresolve(
     */
    startindex = 0;
    *nblocks = 0;
+   *maxblocksize = 0;
    *nblockvars = 0;
 
    SCIP_CALL( SCIPallocBlockMemoryArray(scip, blockstart, nvars/2) );
@@ -762,9 +764,9 @@ SCIP_RETCODE presolveTwoOpt(
    int nintvars;
    int nvars;
    SCIP_VAR** vars;
-   int nbinblockvars = 0;
+   int nbinblockvars;
    int nintblockvars;
-   int maxbinblocksize = 0;
+   int maxbinblocksize;
    int maxintblocksize;
 
    assert(scip != NULL);
@@ -777,27 +779,31 @@ SCIP_RETCODE presolveTwoOpt(
    /* get necessary variable information, i.e. number of binary and integer variables */
    SCIP_CALL( SCIPgetVarsData(scip, &vars, &nvars, &nbinvars, &nintvars, NULL, NULL) );
 
+#ifdef SCIP_STATISTIC
+   /* update statistics */
+   heurdata->ntotalbinvars += nbinvars;
+#endif
+
    /* if number of binary problem variables exceeds 2, they are subject to 2-optimization algorithm, hence heuristic
     * calls innerPresolve method to detect necessary structures. */
    if( nbinvars >= 2 )
    {
       SCIP_CALL( innerPresolve(scip, vars, &(heurdata->binvars), nbinvars, &(heurdata->nbinblocks), &maxbinblocksize,
             &nbinblockvars, &(heurdata->binblockstart), &(heurdata->binblockend), heur, heurdata) );
-   }
-
-   heurdata->nbinvars = nbinvars;
-   heurdata->execute = nbinvars > 1 && heurdata->nbinblocks > 0;
 
 #ifdef SCIP_STATISTIC
-   /* update statistics */
-   heurdata->binnblocks += (heurdata->nbinblocks);
-   heurdata->binnblockvars += nbinblockvars;
-   heurdata->ntotalbinvars += nbinvars;
-   heurdata->maxbinblocksize = MAX(maxbinblocksize, heurdata->maxbinblocksize);
+      /* update statistics */
+      heurdata->binnblocks += heurdata->nbinblocks;
+      heurdata->binnblockvars += nbinblockvars;
+      heurdata->maxbinblocksize = MAX(maxbinblocksize, heurdata->maxbinblocksize);
 
-   SCIPstatisticMessage("   Twoopt BINARY presolving finished with <%d> blocks, <%d> block variables \n",
-      heurdata->nbinblocks, nbinblockvars);
+      SCIPstatisticMessage("   Twoopt BINARY presolving finished with <%d> blocks, <%d> block variables \n",
+         heurdata->nbinblocks, nbinblockvars);
 #endif
+   }
+
+   heurdata->nbinvars = nbinvars;
+   heurdata->execute = nbinvars > 1 && heurdata->nbinblocks > 0;
 
    if( heurdata->intopt && nintvars > 1 )
    {

src/scip/heuristics.c

@@ -568,7 +568,7 @@ SCIP_RETCODE SCIPperformGenericDivingAlgorithm(
       {
          SCIP_VAR* bdchgvar;
          SCIP_Real bdchgvalue;
-         SCIP_Longint localdomreds;
+         SCIP_Longint localdomreds = 0;
          SCIP_BRANCHDIR bdchgdir;
          int nbdchanges;
 
@@ -746,7 +746,7 @@ SCIP_RETCODE SCIPperformGenericDivingAlgorithm(
          while( backtrack );
 
          /* we add the domain reductions from the last evaluated node */
-         domreds += localdomreds; /*lint !e771 lint thinks localdomreds has not been initialized */
+         domreds += localdomreds;
 
          /* store candidate for pseudo cost update and choose next candidate only if no cutoff was detected */
          if( ! cutoff )

src/scip/nlhdlr_perspective.c

@@ -1712,7 +1712,7 @@ SCIP_DECL_NLHDLRENFO(nlhdlrEnfoPerspective)
       if( doprobingind )
       {
          SCIP_Bool propagate;
-         SCIP_Bool cutoff_probing;
+         SCIP_Bool cutoff_probing = FALSE;
          SCIP_Bool cutoff;
          SCIP_Bool fixed;
 

src/scip/reader_fzn.c

@@ -1536,9 +1536,9 @@ SCIP_RETCODE parseOutputDimensioninfo(
    DIMENSIONS**          info                /**< pointer to store the output dimension information if one */
    )
 {
-   FZNNUMBERTYPE type;
-   SCIP_Real lb;
-   SCIP_Real ub;
+   FZNNUMBERTYPE type = FZN_INT;   /* init for scan-build */
+   SCIP_Real lb = SCIP_INVALID;  /* init for scan-build */
+   SCIP_Real ub = SCIP_INVALID;  /* init for scan-build */
    int nelements;
    int size;
 

src/scip/reader_osil.c

@@ -2480,6 +2480,7 @@ SCIP_DECL_READERREAD(readerReadOsil)
       xmlFreeNode(start);
 
    /* free memory for constraint information (position nconss belongs to the nonlinear objective function) */
+   assert(termssize != NULL);
    for( c = nconss; c >= 0; --c )
    {
       /* free nonlinear parts */

src/scip/reader_zpl.c

@@ -92,6 +92,13 @@ extern "C" {
 }
 #endif
 
+/* disable warning that our callbacks, like xlp_addvar, may return NULL if there was an error earlier,
+ * even though they were declared __attribute__((__nonnull__))
+ */
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wnonnull"
+#endif
+
 #define READER_NAME             "zplreader"
 #define READER_DESC             "file reader for ZIMPL model files"
 #define READER_EXTENSION        "zpl"

src/scip/scip_var.c

@@ -1170,16 +1170,17 @@ void SCIPfreeParseVarsPolynomialData(
    assert(monomialexps  != NULL);
    assert(monomialcoefs != NULL);
    assert(monomialnvars != NULL);
-   assert((*monomialvars  != NULL) == (nmonomials > 0));
-   assert((*monomialexps  != NULL) == (nmonomials > 0));
-   assert((*monomialcoefs != NULL) == (nmonomials > 0));
-   assert((*monomialnvars != NULL) == (nmonomials > 0));
 
    SCIP_CALL_ABORT( SCIPcheckStage(scip, "SCIPfreeParseVarsPolynomialData", FALSE, TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
 
    if( nmonomials == 0 )
       return;
 
+   assert(*monomialvars  != NULL);
+   assert(*monomialexps  != NULL);
+   assert(*monomialcoefs != NULL);
+   assert(*monomialnvars != NULL);
+
    for( i = nmonomials - 1; i >= 0; --i )
    {
       SCIPfreeBlockMemoryArrayNull(scip, &(*monomialexps)[i], (*monomialnvars)[i]);