From f54d97c5ef58b436a21373537f85bf5ac8159d8c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 21 Jul 2014 22:41:30 -0400 Subject: 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.) --- src/timezone/pgtz.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/timezone/pgtz.c') diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index c673f1aa10f..581e27bba31 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -296,6 +296,9 @@ pg_tzset(const char *name) * The GMT offset is specified in seconds, positive values meaning west of * Greenwich (ie, POSIX not ISO sign convention). However, we use ISO * 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_tzset_offset(long gmtoffset) -- cgit v1.2.3