postgres.git / summary / log / commit / refs

commit    f54d97c5ef58b436a21373537f85bf5ac8159d8c
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Jul 22 02:41:30 2014 +0000
First released in: 9.5.0, 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.0

    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/backend/commands/variable.c | 7 +++++++
 src/timezone/pgtz.c             | 3 +++
 2 files changed, 10 insertions(+)

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)


[parent: e1ea61a30121]