diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-07-21 22:41:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-07-21 22:41:23 -0400 |
| commit | ecb2d583ca6b248a94c8b53e74dac1ec863a4db7 (patch) | |
| tree | 410e48e2e414c55864a5f02339d6631c9fda3ff6 /src/backend/commands/variable.c | |
| parent | c85374626f680902c207285b986ac38a134535eb (diff) | |
| download | postgresql-ecb2d583ca6b248a94c8b53e74dac1ec863a4db7.tar.gz postgresql-ecb2d583ca6b248a94c8b53e74dac1ec863a4db7.zip | |
Reject out-of-range numeric timezone specifications.
In commit 631dc390f49909a5c8ebd6002cfb2bcee5415a9d, we started to handle
simple numeric timezone offsets via the zic library instead of the old
CTimeZone/HasCTZSet kluge. However, we overlooked the fact that the zic
code will reject UTC offsets exceeding a week (which seems a bit arbitrary,
but not because it's too tight ...). This led to possibly setting
session_timezone to NULL, which results in crashes in most timezone-related
operations as of 9.4, and crashes in a small number of places even before
that. So check for NULL return from pg_tzset_offset() and report an
appropriate error message. Per bug #11014 from Duncan Gillis.
Back-patch to all supported branches, like the previous patch.
(Unfortunately, as of today that no longer includes 8.4.)
Diffstat (limited to 'src/backend/commands/variable.c')
| -rw-r--r-- | src/backend/commands/variable.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index f299738d66b..40a991653d5 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -349,6 +349,13 @@ check_timezone(char **newval, void **extra, GucSource source) } } + /* Test for failure in pg_tzset_offset, which we assume is out-of-range */ + if (!new_tz) + { + GUC_check_errdetail("UTC timezone offset is out of range."); + return false; + } + /* * Pass back data for assign_timezone to use */ |