summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-21 22:25:12 +0000
committerpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-21 22:25:12 +0000
commitb05bdd9efcc17348749000d80d232320de38f9d0 (patch)
tree519d152e6fa6852974d79bcbc3bde28c0978f567
parentb2ad13e2dddac30e6e4e4c4bca512eea490401dd (diff)
downloadppe42-gcc-b05bdd9efcc17348749000d80d232320de38f9d0.tar.gz
ppe42-gcc-b05bdd9efcc17348749000d80d232320de38f9d0.zip
* etime.c (etime_sub): Remove array rank check;
Add check for sufficient space. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83456 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/intrinsics/etime.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 36abe2a193d..107f9035356 100644
--- 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 89ee539f064..cd11af927c6 100644
--- 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;
OpenPOWER on IntegriCloud