rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 17:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

When checking for datetime field overflow, we should allow a fractional-second

Browse Source 
part that rounds up to exactly 1.0 second.  The previous coding rejected input
like "00:12:57.9999999999999999999999999999", with the exact number of nines
needed to cause failure varying depending on float-timestamp option and
possibly on platform.  Obviously this should round up to the next integral
second, if we don't have enough precision to distinguish the value from that.
Per bug #4789 from Robert Kruus.

In passing, fix a missed check for fractional seconds in one copy of the
"is it greater than 24:00:00" code.

Broken all the way back, so patch all the way back.
This commit is contained in:
Tom Lane 2009-05-01 19:29:07 +00:00
parent cfb61be9cf
commit fe1b07a6f9
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/utils/adt/datetime.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.203 2009/03/22 01:12:31 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.204 2009/05/01 19:29:07 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -950,7 +950,8 @@ DecodeDateTime(char **field, int *ftype, int nf,
*/ */
/* test for > 24:00:00 */ /* test for > 24:00:00 */
if (tm->tm_hour > 24 || if (tm->tm_hour > 24 ||
(tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0))) (tm->tm_hour == 24 &&
(tm->tm_min > 0 || tm->tm_sec > 0 || *fsec > 0)))
return DTERR_FIELD_OVERFLOW; return DTERR_FIELD_OVERFLOW;
break; break;
@ -2058,15 +2059,13 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 || if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
tm->tm_sec < 0 || tm->tm_sec > 60 || tm->tm_hour > 24 || tm->tm_sec < 0 || tm->tm_sec > 60 || tm->tm_hour > 24 ||
/* test for > 24:00:00 */ /* test for > 24:00:00 */
(tm->tm_hour == 24 &&
(tm->tm_min > 0 || tm->tm_sec > 0 || *fsec > 0)) ||
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
(tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0 || *fsec < INT64CONST(0) || *fsec > USECS_PER_SEC
*fsec > INT64CONST(0))) ||
*fsec < INT64CONST(0) || *fsec >= USECS_PER_SEC
#else #else
(tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0 || *fsec < 0 || *fsec > 1
*fsec > 0)) ||
*fsec < 0 || *fsec >= 1
#endif #endif
) )
return DTERR_FIELD_OVERFLOW; return DTERR_FIELD_OVERFLOW;
@ -2386,11 +2385,11 @@ DecodeTime(char *str, int fmask, int range,
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 || if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
tm->tm_sec < 0 || tm->tm_sec > 60 || *fsec < INT64CONST(0) || tm->tm_sec < 0 || tm->tm_sec > 60 || *fsec < INT64CONST(0) ||
*fsec >= USECS_PER_SEC) *fsec > USECS_PER_SEC)
return DTERR_FIELD_OVERFLOW; return DTERR_FIELD_OVERFLOW;
#else #else
if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 || if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
tm->tm_sec < 0 || tm->tm_sec > 60 || *fsec < 0 || *fsec >= 1) tm->tm_sec < 0 || tm->tm_sec > 60 || *fsec < 0 || *fsec > 1)
return DTERR_FIELD_OVERFLOW; return DTERR_FIELD_OVERFLOW;
#endif #endif