diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-02 16:41:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-02 16:41:41 +0000 |
| commit | 517b078d0e01f0b659df08cdd19b1f35efb95f3c (patch) | |
| tree | 87951e1136e824011a4d5dbca26537c3e2db7e7a /src | |
| parent | 20c031eb8a9e9d0e74159d8d1d0dd1f77c3db648 (diff) | |
| download | postgresql-517b078d0e01f0b659df08cdd19b1f35efb95f3c.tar.gz postgresql-517b078d0e01f0b659df08cdd19b1f35efb95f3c.zip | |
Fix erroneous error reporting for overlength input in text_date(),
text_time(), and text_timetz(). 7.4-vintage bug found by Greg Stark.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/date.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index b47a71adb5a..a1c57b2e331 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93.2.3 2005/05/26 02:14:31 neilc Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93.2.4 2007/06/02 16:41:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -523,8 +523,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++) @@ -1249,7 +1250,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; @@ -2017,8 +2019,9 @@ text_timetz(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for type time with time zone: \"%s\"", - VARDATA(str)))); + errmsg("invalid input syntax for type time with time zone: \"%s\"", + DatumGetCString(DirectFunctionCall1(textout, + PointerGetDatum(str)))))); sp = VARDATA(str); dp = dstr; |