Fix overflow check in tm2timestamp (this time for sure).

I fixed this code back in commit 841b4a2d5, but didn't think carefully
enough about the behavior near zero, which meant it improperly rejected
1999-12-31 24:00:00.  Per report from Magnus Hagander.

diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 451f4dae70c04e452e58400cc6d60329d342a374..1a848f9a33b42a843a410208e3eaf3fb2ea9f73d 100644 (file)
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1690,8 +1690,9 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
                return -1;
        }
        /* check for just-barely overflow (okay except time-of-day wraps) */
-       if ((*result < 0 && date >= 0) ||
-               (*result >= 0 && date < 0))
+       /* caution: we want to allow 1999-12-31 24:00:00 */
+       if ((*result < 0 && date > 0) ||
+               (*result > 0 && date < -1))
        {
                *result = 0;                    /* keep compiler quiet */
                return -1;

diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 36f101bb1c766f216eae7cf8f47a83a41054ea23..cccd2814d2c484a8069762e136fac1afa0692f58 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -76,8 +76,9 @@ tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp * result)
        if ((*result - time) / USECS_PER_DAY != dDate)
                return -1;
        /* check for just-barely overflow (okay except time-of-day wraps) */
-       if ((*result < 0 && dDate >= 0) ||
-               (*result >= 0 && dDate < 0))
+       /* caution: we want to allow 1999-12-31 24:00:00 */
+       if ((*result < 0 && dDate > 0) ||
+               (*result > 0 && dDate < -1))
                return -1;
 #else
        *result = dDate * SECS_PER_DAY + time;