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

CHANGELOG

@@ -152,6 +152,7 @@ Fixed bugs
 - check for more data to be freed before modifying nonlinear constraints in SCIPaddExprNonlinear()
 - allow for terms with zero coefficients when checking sum in SCIPexprCheckQuadratic()
 - do not abort writing of constraints to lp/pip files (and forget to free buffer memory) when encountering unsupported nonlinear constraint
+- fixed that names and description of the LPI's were not null-terminated
 
 Performance improvements
 ------------------------

src/lpi/lpi_cpx.c

@@ -1022,6 +1022,7 @@ static const char cpxname[]= {'C', 'P', 'L', 'E', 'X', ' ',
 #else
    (CPX_VERSION / 100) + '0', '.', ((CPX_VERSION % 100) / 10) + '0', '.', (CPX_VERSION % 10) + '0', '.', CPX_SUBVERSION + '0'
 #endif
+   , '\0'
 };
 
 

src/lpi/lpi_grb.c

@@ -1249,7 +1249,7 @@ static const char grbname[] = {'G', 'u', 'r', 'o', 'b', 'i', ' ',
 #else
    (GRB_VERSION_MAJOR/10) + '0', (GRB_VERSION_MAJOR%10) + '0',       /*lint !e778*/
 #endif
-   '.', GRB_VERSION_MINOR + '0', '.', GRB_VERSION_TECHNICAL + '0'};  /*lint !e835*/
+   '.', GRB_VERSION_MINOR + '0', '.', GRB_VERSION_TECHNICAL + '0', '\0'};  /*lint !e835*/
 
 /**@name Miscellaneous Methods */
 /**@{ */

src/lpi/lpi_spx1.cpp

@@ -1634,9 +1634,9 @@ void invalidateSolution(SCIP_LPI* lpi)
 char* initSpxDesc( );
 
 #if (SOPLEX_SUBVERSION > 0)
-   const static char spxname[20]= {'S', 'o', 'p', 'l', 'e', 'x', '1', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '.', SOPLEX_SUBVERSION + '0'};
+   const static char spxname[20]= {'S', 'o', 'p', 'l', 'e', 'x', '1', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '.', SOPLEX_SUBVERSION + '0', '\0'};
 #else
-   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', '1', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0'};
+   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', '1', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '\0'};
 #endif
 
 static char* spxdesc = initSpxDesc();

src/lpi/lpi_spx2.cpp

@@ -974,9 +974,9 @@ void invalidateSolution(SCIP_LPI* lpi)
  */
 
 #if (SOPLEX_SUBVERSION > 0)
-   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '.', SOPLEX_SUBVERSION + '0'};
+   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '.', SOPLEX_SUBVERSION + '0', '\0'};
 #else
-   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0'};
+   const static char spxname[20] = {'S', 'o', 'p', 'l', 'e', 'x', ' ', SOPLEX_VERSION/100 + '0', '.', (SOPLEX_VERSION % 100)/10 + '0', '.', SOPLEX_VERSION % 10 + '0', '\0'};
 #endif
 const static char spxdesc[200] =  {'L', 'i', 'n', 'e', 'a', 'r', ' ', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'm', 'i', 'n', 'g',
                                    ' ', 'S', 'o', 'l', 'v', 'e', 'r', ' ' , 'd', 'e', 'v', 'e', 'l', 'o', 'p', 'e', 'd',
@@ -989,7 +989,7 @@ const static char spxdesc[200] =  {'L', 'i', 'n', 'e', 'a', 'r', ' ', 'P', 'r',
                                    ' ', '[', 'G', 'i', 't', 'H', 'a', 's', 'h', ':', ' ',
                                    getGitHash()[0], getGitHash()[1], getGitHash()[2], getGitHash()[3],
                                    getGitHash()[4], getGitHash()[5], getGitHash()[6], getGitHash()[7],
-                                   ']'};
+                                   ']', '\0'};
 
 /**@name Miscellaneous Methods */
 /**@{ */

src/lpi/lpi_xprs.c

@@ -655,7 +655,7 @@ void invalidateSolution(
 #ifdef _Thread_local
 static _Thread_local char xprsname[100];
 #else
-static char xprsname[] = {'X', 'p', 'r', 'e', 's', 's', ' ', '0' + XPVERSION / 10, '0' + XPVERSION % 10};
+static char xprsname[] = {'X', 'p', 'r', 'e', 's', 's', ' ', '0' + XPVERSION / 10, '0' + XPVERSION % 10, '\0'};
 #endif
 /** gets name and version of LP solver */
 const char* SCIPlpiGetSolverName(