Reject out-of-range dates in date_in().

tglsfdc · tglsfdc · commit 7ae2ccbc857f · 2006-02-09T03:39:17.000Z
Kris Jurka
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.164 2005/12/22 21:45:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.165 2006/02/09 03:39:16 tgl Exp $
 -->
 
  <chapter id="datatype">
@@ -1360,7 +1360,7 @@ SELECT b, char_length(b) FROM test2;
         <entry>4 bytes</entry>
         <entry>dates only</entry>
         <entry>4713 BC</entry>
-        <entry>32767 AD</entry>
+        <entry>5874897 AD</entry>
         <entry>1 day</entry>
        </row>
        <row>
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.122 2005/10/15 02:49:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.123 2006/02/09 03:39:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,6 +97,11 @@ date_in(PG_FUNCTION_ARGS)
 			break;
 	}
 
+	if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+				 errmsg("date out of range: \"%s\"", str)));
+
 	date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - POSTGRES_EPOCH_JDATE;
 
 	PG_RETURN_DATEADT(date);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.122 2005/10/15 02:49:28 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.123 2006/02/09 03:39:17 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -97,6 +97,11 @@ date_in(PG_FUNCTION_ARGS)`
`97`	`97`	`break;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday))`
	`101`	`+ ereport(ERROR,`
	`102`	`+ (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
	`103`	`+ errmsg("date out of range: \"%s\"", str)));`
	`104`	`+`
`100`	`105`	`date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - POSTGRES_EPOCH_JDATE;`
`101`	`106`
`102`	`107`	`PG_RETURN_DATEADT(date);`