etime.c (etime_sub): Remove array rank check; Add check for sufficient space.

	* etime.c (etime_sub): Remove array rank check;
	Add check for sufficient space.

From-SVN: r83456

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 36abe2a193d0e6aceb83ec50dc476a93d15c4fa4..107f9035356121f21ea9a684005f6a9794fe9dd2 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-21  Steven G. Kargl  <kargls@comcast.net>
+
+       * etime.c (etime_sub): Remove array rank check;
+       Add check for sufficient space.
+
 2004-06-19  Bud Davis  <bdavis9659@comcast.net>
 
        PR gfortran/16080

diff --git a/libgfortran/intrinsics/etime.c b/libgfortran/intrinsics/etime.c
index 89ee539f0642e53a176d61a0f9d7b9e35ddfcc01..cd11af927c6832217df27871dd4ed6bd03a818f8 100644 (file)
--- a/libgfortran/intrinsics/etime.c
+++ b/libgfortran/intrinsics/etime.c
@@ -57,9 +57,8 @@ prefix(etime_sub) (gfc_array_r4 *t, GFC_REAL_4 *result)
   tt = -1.;
 #endif
 
-  dim = GFC_DESCRIPTOR_RANK (t);
-  if (dim != 1)
-    runtime_error ("Array rank of TARRAY is not 1.");
+  if (((t->dim[0].ubound + 1 - t->dim[0].lbound)) < 2)
+    runtime_error ("Insufficient number of elements in TARRAY.");
 
   if (t->dim[0].stride == 0)
     t->dim[0].stride = 1;