diff options
Diffstat (limited to 'src')
| -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 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 */ diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 3bbe0a86b82..72aa409727d 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) |