database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-17 06:41:24 +03:00
Code

Reject out-of-range numeric timezone specifications.

Browse Source 
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.)
This commit is contained in:
Tom Lane 2014-07-21 22:41:23 -04:00
parent c85374626f
commit ecb2d583ca
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/commands/variable.c
View File

@ -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 * Pass back data for assign_timezone to use
*/ */

3
src/timezone/pgtz.c
View File

@ -296,6 +296,9 @@ pg_tzset(const char *name)
* The GMT offset is specified in seconds, positive values meaning west of * The GMT offset is specified in seconds, positive values meaning west of
* Greenwich (ie, POSIX not ISO sign convention). However, we use ISO * Greenwich (ie, POSIX not ISO sign convention). However, we use ISO
* sign convention in the displayable abbreviation for the zone. * sign convention in the displayable abbreviation for the zone.
*
* Caution: this can fail (return NULL) if the specified offset is outside
* the range allowed by the zic library.
*/ */
pg_tz * pg_tz *
pg_tzset_offset(long gmtoffset) pg_tzset_offset(long gmtoffset)