From 542eeba26992305d872be699158cb3ab1c2be6e6 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 4 Mar 2013 15:13:31 -0500
Subject: [PATCH] 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.
---
src/backend/utils/adt/timestamp.c | 5 +++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 451f4dae70c..1a848f9a33b 100644
--- 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 36f101bb1c7..cccd2814d2c 100644
--- 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;
--
GitLab