]> granicus.if.org Git - postgresql/commitdiff
Fix erroneous error reporting for overlength input in text_date(),
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 2 Jun 2007 16:41:15 +0000 (16:41 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 2 Jun 2007 16:41:15 +0000 (16:41 +0000)
text_time(), and text_timetz().  7.4-vintage bug found by Greg Stark.

src/backend/utils/adt/date.c

index 9efc7125b19d397f92418b58849bd401562bc27e..a252131f679c97b29e9216c7e585e93cf0304bda 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.125 2006/07/14 14:52:23 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.125.2.1 2007/06/02 16:41:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -863,8 +863,9 @@ text_date(PG_FUNCTION_ARGS)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_DATETIME_FORMAT),
                                 errmsg("invalid input syntax for type date: \"%s\"",
-                                               VARDATA(str))));
-
+                                               DatumGetCString(DirectFunctionCall1(textout,
+                                                                                                       PointerGetDatum(str))))));
+       
        sp = VARDATA(str);
        dp = dstr;
        for (i = 0; i < (VARSIZE(str) - VARHDRSZ); i++)
@@ -1590,7 +1591,8 @@ text_time(PG_FUNCTION_ARGS)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_DATETIME_FORMAT),
                                 errmsg("invalid input syntax for type time: \"%s\"",
-                                               VARDATA(str))));
+                                               DatumGetCString(DirectFunctionCall1(textout, 
+                                                                                                       PointerGetDatum(str))))));
 
        sp = VARDATA(str);
        dp = dstr;
@@ -2359,7 +2361,8 @@ text_timetz(PG_FUNCTION_ARGS)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_DATETIME_FORMAT),
                  errmsg("invalid input syntax for type time with time zone: \"%s\"",
-                                VARDATA(str))));
+                                DatumGetCString(DirectFunctionCall1(textout, 
+                                                                                                        PointerGetDatum(str))))));
 
        sp = VARDATA(str);
        dp = dstr;