Merge pull request modelica#3983 from HansOlsson/CrashSpline

Fix index-out-of-bounds exception for splines
casella · Mar 12, 2023 · 64b1f57 · 64b1f57
2 parents ef08d88 + 91ba7ab
commit 64b1f57
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Modelica/Resources/C-Sources/ModelicaStandardTables.c b/Modelica/Resources/C-Sources/ModelicaStandardTables.c
@@ -39,6 +39,10 @@
       Modelica.Blocks.Tables.CombiTable2Dv
 
    Changelog:
+      May 03, 2022:  by Hans Olsson, Dassault Systemes
+                     Fixed index-out-of-bounds exception in spline
+                     initialization of 2D tables that actually degrade
+                     to 1D tables (ticket #3983)
 
       Jan. 31, 2022: by Hans Olsson, Dassault Systemes
                      Added better support for one-sided derivatives of CombiTable2D.
@@ -6925,7 +6929,7 @@ static CubicHermite2D* spline2DInit(_In_ const double* table, size_t nRow,
             return NULL;
         }
 
-        spline = (CubicHermite2D*)malloc((nCol - 1)*sizeof(CubicHermite2D));
+        spline = (CubicHermite2D*)malloc((nCol - 2)*sizeof(CubicHermite2D));
         if (NULL == spline) {
             free(tableT);
             return NULL;
@@ -6943,7 +6947,7 @@ static CubicHermite2D* spline2DInit(_In_ const double* table, size_t nRow,
             return NULL;
         }
         /* Copy coefficients */
-        for (j = 0; j < nCol - 1; j++) {
+        for (j = 0; j < nCol - 2; j++) {
             const double* c1 = spline1D[j];
             double* c2 = spline[j];
             c2[0] = c1[0];
@@ -6957,7 +6961,7 @@ static CubicHermite2D* spline2DInit(_In_ const double* table, size_t nRow,
         size_t i;
         int cols = 2;
 
-        spline = (CubicHermite2D*)malloc((nRow - 1)*sizeof(CubicHermite2D));
+        spline = (CubicHermite2D*)malloc((nRow - 2)*sizeof(CubicHermite2D));
         if (NULL == spline) {
             return NULL;
         }
@@ -6968,7 +6972,7 @@ static CubicHermite2D* spline2DInit(_In_ const double* table, size_t nRow,
             return NULL;
         }
         /* Copy coefficients */
-        for (i = 0; i < nRow - 1; i++) {
+        for (i = 0; i < nRow - 2; i++) {
             const double* c1 = spline1D[i];
             double* c2 = spline[i];
             c2[0] = c1[0];