From a388c77976fdac5a5773a9b71ee5f1644352a362 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 22 Nov 2008 21:41:27 +0000 Subject: re PR libfortran/38225 (RESHAPE bounds with multi-dimensional SOURCE) 2008-11-22 Thomas Koenig PR libfortran/38225 * intrinsics/reshape_generic.c (reshape_internal): Use all dimensions of source for bounds checking. * 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-11-22 Thomas Koenig PR libfortran/38225 * gfortran.dg/reshape_3.f90: New test. From-SVN: r142125 --- libgfortran/generated/reshape_i16.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libgfortran/generated/reshape_i16.c') diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c index 2888511..f46d758 100644 --- a/libgfortran/generated/reshape_i16.c +++ b/libgfortran/generated/reshape_i16.c @@ -135,7 +135,14 @@ reshape_16 (gfc_array_i16 * const restrict ret, (long int) ret_extent, (long int) shape_data[n]); } - source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound; + source_extent = 1; + sdim = GFC_DESCRIPTOR_RANK (source); + for (n = 0; n < sdim; n++) + { + index_type se; + se = source->dim[n].ubound + 1 - source->dim[0].lbound; + source_extent *= se > 0 ? se : 0; + } if (rs < source_extent || (rs > source_extent && !pad)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" -- cgit v1.1