diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-07-21 22:41:20 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-07-21 22:41:20 -0400 |
| commit | 6412f3e2d09b562fafc129c134e7336c4fe790ed (patch) | |
| tree | 37c333c2b5836afe9e811f97e2cf2a6d379a0a95 /src/backend/commands/variable.c | |
| parent | 212825f8139abbcfe366a8f884193b5b693921de (diff) | |
| download | postgresql-6412f3e2d09b562fafc129c134e7336c4fe790ed.tar.gz postgresql-6412f3e2d09b562fafc129c134e7336c4fe790ed.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 */ |