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

tglsfdc · tglsfdc · commit 542eeba26992 · 2013-03-04T15:13:31.000-05:00
I fixed this code back in commit 841b4a2, 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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1690,8 +1690,9 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int tzp, Timestamp result)`
`1690`	`1690`	`return -1;`
`1691`	`1691`	`}`
`1692`	`1692`	`/* check for just-barely overflow (okay except time-of-day wraps) */`
`1693`		`- if ((*result < 0 && date >= 0) \|\|`
`1694`		`- (*result >= 0 && date < 0))`
	`1693`	`+ /* caution: we want to allow 1999-12-31 24:00:00 */`
	`1694`	`+ if ((*result < 0 && date > 0) \|\|`
	`1695`	`+ (*result > 0 && date < -1))`
`1695`	`1696`	`{`
`1696`	`1697`	`result = 0; / keep compiler quiet */`
`1697`	`1698`	`return -1;`