diff options
| -rw-r--r-- | src/backend/commands/variable.c | 7 | ||||
| -rw-r--r-- | src/timezone/pgtz.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index e6d65c175d6..64fbf28a1e1 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -372,6 +372,13 @@ check_timezone(char **newval, void **extra, GucSource source) } } + /* Test for failure in pg_tzset_offset, which we assume is out-of-range */ + if (!myextra.session_timezone) + { + GUC_check_errdetail("UTC timezone offset is out of range."); + return false; + } + /* * Prepare the canonical string to return. GUC wants it malloc'd. * 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) |