X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libgfortran%2Fgenerated%2Freshape_c16.c;h=968fb9c34ce88122f21f4cb9d847e2c82f491f68;hp=79745f2de5828fb9d19f799534b477efc6ae4f2b;hb=d0b5b6ea1ad7a0081f7b0e7f4bc284f49ee51238;hpb=da982362f10f6955efd57fa4d59a399a18f9d226

diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index 79745f2de58..968fb9c34ce 100644
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -137,7 +137,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
 
       source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
 
-      if (rs != source_extent)
+      if (rs < source_extent || (rs > source_extent && !pad))
 	runtime_error("Incorrect size in SOURCE argument to RESHAPE"
 		      " intrinsic: is %ld, should be %ld",
 		      (long int) source_extent, (long int) rs);
@@ -262,16 +262,16 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
 
   if (sempty)
     {
-      /* Switch immediately to the pad array.  */
+      /* Pretend we are using the pad array the first time around, too.  */
       src = pptr;
-      sptr = NULL;
+      sptr = pptr;
       sdim = pdim;
       for (dim = 0; dim < pdim; dim++)
 	{
 	  scount[dim] = pcount[dim];
 	  sextent[dim] = pextent[dim];
 	  sstride[dim] = pstride[dim];
-	  sstride0 = sstride[0] * sizeof (GFC_COMPLEX_16);
+	  sstride0 = pstride[0];
 	}
     }