From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Fri, 4 Jun 2010 06:50:11 +0000 (+0000)
Subject: re PR libfortran/34670 (bounds checking for array intrinsics)
X-Git-Tag: releases/gcc-4.6.0~6776
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07fc109c14de23eeadc166eec55d954d2993c8bd;p=thirdparty%2Fgcc.git

re PR libfortran/34670 (bounds checking for array intrinsics)

2010-06-04  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/34670
	* intrinsics/date_and_time.c:  Replace assert with runtime_error
	when VALUE is too small.

From-SVN: r160253
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index e90848cf57fb..84675b92ba5f 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-04  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR libfortran/34670
+	* intrinsics/date_and_time.c:  Replace assert with runtime_error
+	when VALUE is too small.
+
 2010-05-20 Jerry DeLisle <jvdelisle@gcc.gnu.org>
 
 	PR fortran/43851
diff --git a/libgfortran/intrinsics/date_and_time.c b/libgfortran/intrinsics/date_and_time.c
index 647dd9ad7a36..21e4320e134e 100644
--- a/libgfortran/intrinsics/date_and_time.c
+++ b/libgfortran/intrinsics/date_and_time.c
@@ -280,8 +280,12 @@ date_and_time (char *__date, char *__time, char *__zone,
       delta = GFC_DESCRIPTOR_STRIDE(__values,0);
       if (delta == 0)
 	delta = 1;
+      
+      if (unlikely (len < VALUES_SIZE))
+	  runtime_error ("Incorrect extent in VALUE argument to"
+			 " DATE_AND_TIME intrinsic: is %ld, should"
+			 " be >=%ld", (long int) len, (long int) VALUES_SIZE);
 
-      assert (len >= VALUES_SIZE);
       /* Cope with different type kinds.  */
       if (elt_size == 4)
         {