From fd7f97542330504c3ead0e857be4a94eb6f55b07 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sun, 7 Sep 2008 13:33:18 +0000 Subject: re PR fortran/37203 (Check ORDER= of RESHAPE) 2008-09-07 Thomas Koenig PR fortran/37203 * intrinsics/reshape_generic.c: Add checking on out-of-bounds and duplicate values of order argument. * m4/reshape.m4: Likewise. * generated/reshape_c10.c: Regenerated. * generated/reshape_c16.c: Regenerated. * generated/reshape_c4.c: Regenerated. * generated/reshape_c8.c: Regenerated. * generated/reshape_i16.c: Regenerated. * generated/reshape_i4.c: Regenerated. * generated/reshape_i8.c: Regenerated. * generated/reshape_r10.c: Regenerated. * generated/reshape_r16.c: Regenerated. * generated/reshape_r4.c: Regenerated. * generated/reshape_r8.c: Regenerated. 2008-09-07 Thomas Koenig PR fortran/37203 * gfortran.d/reshape_order_1.f90: New test case. * gfortran.d/reshape_order_2.f90: New test case. * gfortran.d/reshape_order_3.f90: New test case. * gfortran.d/reshape_order_4.f90: New test case. From-SVN: r140086 --- libgfortran/generated/reshape_i8.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'libgfortran/generated/reshape_i8.c') diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index bf3185e..75ba319 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -119,6 +119,33 @@ reshape_8 (gfc_array_i8 * const restrict ret, if (shape_empty) return; + if (unlikely (compile_options.bounds_check)) + { + if (order) + { + int seen[GFC_MAX_DIMENSIONS]; + index_type v; + + for (n = 0; n < rdim; n++) + seen[n] = 0; + + for (n = 0; n < rdim; n++) + { + v = order->data[n * order->dim[0].stride] - 1; + + if (v < 0 || v >= rdim) + runtime_error("Value %ld out of range in ORDER argument" + " to RESHAPE intrinsic", (long int) v + 1); + + if (seen[v] != 0) + runtime_error("Duplicate value %ld in ORDER argument to" + " RESHAPE intrinsic", (long int) v + 1); + + seen[v] = 1; + } + } + } + rsize = 1; for (n = 0; n < rdim; n++) { -- cgit v1.1