From f064d5167b03b9723eab97d33eb19f369de5bd23 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 26 May 2009 01:29:09 +0000 Subject: [PATCH] Add range checks to time_recv() and timetz_recv(), to prevent binary input of time values that would not be accepted via textual input. Per gripe from Andrew McNamara. This is potentially a back-patchable bug fix, but for the moment it doesn't seem sufficiently high impact to justify doing that. --- src/backend/utils/adt/date.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 4a4215ca3a..1e6eb52785 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -1088,8 +1088,18 @@ time_recv(PG_FUNCTION_ARGS) #ifdef HAVE_INT64_TIMESTAMP result = pq_getmsgint64(buf); + + if (result < INT64CONST(0) || result > USECS_PER_DAY) + ereport(ERROR, + (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), + errmsg("time out of range"))); #else result = pq_getmsgfloat8(buf); + + if (result < 0 || result > (double) SECS_PER_DAY) + ereport(ERROR, + (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), + errmsg("time out of range"))); #endif AdjustTimeForTypmod(&result, typmod); @@ -1853,11 +1863,29 @@ timetz_recv(PG_FUNCTION_ARGS) #ifdef HAVE_INT64_TIMESTAMP result->time = pq_getmsgint64(buf); + + if (result->time < INT64CONST(0) || result->time > USECS_PER_DAY) + ereport(ERROR, + (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), + errmsg("time out of range"))); #else result->time = pq_getmsgfloat8(buf); + + if (result->time < 0 || result->time > (double) SECS_PER_DAY) + ereport(ERROR, + (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), + errmsg("time out of range"))); #endif + result->zone = pq_getmsgint(buf, sizeof(result->zone)); + /* we allow GMT displacements up to 14:59:59, cf DecodeTimezone() */ + if (result->zone <= -15 * SECS_PER_HOUR || + result->zone >= 15 * SECS_PER_HOUR) + ereport(ERROR, + (errcode(ERRCODE_INVALID_TIME_ZONE_DISPLACEMENT_VALUE), + errmsg("time zone displacement out of range"))); + AdjustTimeForTypmod(&(result->time), typmod); PG_RETURN_TIMETZADT_P(result); -- 2.39.5