Add bounds checking of array access during runtime

OpenModelica · Jan 20, 2020 · 6fa1e68 · 6fa1e68
1 parent 80b40a6
commit 6fa1e68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/OMCompiler/SimulationRuntime/c/util/integer_array.c b/OMCompiler/SimulationRuntime/c/util/integer_array.c
@@ -536,6 +536,9 @@ modelica_integer* integer_array_element_addr1(const integer_array_t * source,
 
 modelica_integer* integer_array_element_addr2(const integer_array_t * source,int ndims,int dim1,int dim2)
 {
+    if (dim1 < 1 || dim1 > source->dim_size[0] || dim2 < 1 || dim2 > source->dim_size[1]) {
+      throwStreamPrint(NULL, "integer_array_element_addr2: array has dimensions [%d,%d], got subscripts [%d,%d]", source->dim_size[1], source->dim_size[2], dim1, dim2);
+    }
     return integer_ptrget(source, ((dim1 - 1) * source->dim_size[1]) + (dim2 - 1));
 }
 

diff --git a/OMCompiler/SimulationRuntime/c/util/real_array.c b/OMCompiler/SimulationRuntime/c/util/real_array.c
@@ -522,6 +522,9 @@ modelica_real* real_array_element_addr1(const real_array_t * source,int ndims,in
 
 modelica_real* real_array_element_addr2(const real_array_t * source,int ndims,int dim1,int dim2)
 {
+    if (dim1 < 1 || dim1 > source->dim_size[0] || dim2 < 1 || dim2 > source->dim_size[1]) {
+      throwStreamPrint(NULL, "real_array_element_addr2: array has dimensions [%d,%d], got subscripts [%d,%d]", source->dim_size[1], source->dim_size[2], dim1, dim2);
+    }
     return real_ptrget(source, ((dim1 - 1) * source->dim_size[1]) + (dim2 - 1));
 }