diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-06-04 16:42:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-06-04 16:42:23 -0400 |
| commit | a9632830bb05dc98ae24017cafc652e4a66d44a8 (patch) | |
| tree | 04cfd1774c957b6998651324ef1d43b5677b26f8 /src/include/utils/date.h | |
| parent | f5067049cde38cd0d6333a5e3bf1bed8d99e6f44 (diff) | |
| download | postgresql-a9632830bb05dc98ae24017cafc652e4a66d44a8.tar.gz | |
Reject "23:59:60.nnn" in datetime input.
It's intentional that we don't allow values greater than 24 hours,
while we do allow "24:00:00" as well as "23:59:60" as inputs.
However, the range check was miscoded in such a way that it would
accept "23:59:60.nnn" with a nonzero fraction. For time or timetz,
the stored result would then be greater than "24:00:00" which would
fail dump/reload, not to mention possibly confusing other operations.
Fix by explicitly calculating the result and making sure it does not
exceed 24 hours. (This calculation is redundant with what will happen
later in tm2time or tm2timetz. Maybe someday somebody will find that
annoying enough to justify refactoring to avoid the duplication; but
that seems too invasive for a back-patched bug fix, and the cost is
probably unmeasurable anyway.)
Note that this change also rejects such input as the time portion
of a timestamp(tz) value.
Back-patch to v10. The bug is far older, but to change this pre-v10
we'd need to ensure that the logic behaves sanely with float timestamps,
which is possibly nontrivial due to roundoff considerations.
Doesn't really seem worth troubling with.
Per report from Christoph Berg.
Discussion: https://postgr.es/m/20200520125807.GB296739@msg.df7cb.de
Diffstat (limited to 'src/include/utils/date.h')
| -rw-r--r-- | src/include/utils/date.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 91c8b36e66..4cdb1f97cc 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -80,6 +80,8 @@ extern int time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec); extern int timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp); extern int tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result); extern int tm2timetz(struct pg_tm *tm, fsec_t fsec, int tz, TimeTzADT *result); +extern bool time_overflows(int hour, int min, int sec, fsec_t fsec); +extern bool float_time_overflows(int hour, int min, double sec); extern void AdjustTimeForTypmod(TimeADT *time, int32 typmod); #endif /* DATE_H */ |