summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2012-05-30 23:58:59 +0000
committerTom Lane2012-05-30 23:58:59 +0000
commit4d3482a741a5f6c7594e60430cadb0f15024cab2 (patch)
treea827d1d236bc3a59308ef3b9149afee6686f9abb
parentdd957a5bb90b05269f61db7bd3d9785afd5eb0e5 (diff)
Expand the allowed range of timezone offsets to +/-15:59:59 from Greenwich.
We used to only allow offsets less than +/-13 hours, then it was +/14, then it was +/-15. That's still not good enough though, as per today's bug report from Patric Bechtel. This time I actually looked through the Olson timezone database to find the largest offsets used anywhere. The winners are Asia/Manila, at -15:56:00 until 1844, and America/Metlakatla, at +15:13:42 until 1867. So we'd better allow offsets less than +/-16 hours. Given the history, we are way overdue to have some greppable #define symbols controlling this, so make some ... and also remove an obsolete comment that didn't get fixed the last time. Back-patch to all supported branches.
-rw-r--r--src/backend/utils/adt/datetime.c6
-rw-r--r--src/include/utils/timestamp.h10
2 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 1408d67a4a4..184c8f441b0 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -2571,9 +2571,6 @@ DecodeNumberField(int len, char *str, int fmask,
* Return 0 if okay (and set *tzp), a DTERR code if not okay.
*
* NB: this must *not* ereport on failure; see commands/variable.c.
- *
- * Note: we allow timezone offsets up to 13:59. There are places that
- * use +1300 summer time.
*/
static int
DecodeTimezone(char *str, int *tzp)
@@ -2618,7 +2615,8 @@ DecodeTimezone(char *str, int *tzp)
else
min = 0;
- if (hr < 0 || hr > 14)
+ /* Range-check the values; see notes in utils/timestamp.h */
+ if (hr < 0 || hr > MAX_TZDISP_HOUR)
return DTERR_TZDISP_OVERFLOW;
if (min < 0 || min >= 60)
return DTERR_TZDISP_OVERFLOW;
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 1f73a2a081a..f8a4bdca1dd 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -90,6 +90,16 @@ typedef struct
#endif
/*
+ * We allow numeric timezone offsets up to 15:59:59 either way from Greenwich.
+ * Currently, the record holders for wackiest offsets in actual use are zones
+ * Asia/Manila, at -15:56:00 until 1844, and America/Metlakatla, at +15:13:42
+ * until 1867. If we were to reject such values we would fail to dump and
+ * restore old timestamptz values with these zone settings.
+ */
+#define MAX_TZDISP_HOUR 15 /* maximum allowed hour part */
+#define TZDISP_LIMIT ((MAX_TZDISP_HOUR + 1) * SECS_PER_HOUR)
+
+/*
* Macros for fmgr-callable functions.
*
* For Timestamp, we make use of the same support routines as for int64