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 45e70029e532e29c9a3bbb31d2e6d3f6e5d03684..d11962802a7b379cc3eb4218d0b61a26ea76fad8 100644 (file)
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1564,8 +1564,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 8354e460d02f1ddb8c6d7cfe96ab69f7a0808231..570b9bad94589d001fea545131ba155cb6b23b39 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;