Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7672bbc

Browse files
committed
Reject out-of-range numeric timezone specifications.
In commit631dc39, we started to handlesimple numeric timezone offsets via the zic library instead of the oldCTimeZone/HasCTZSet kluge. However, we overlooked the fact that the ziccode will reject UTC offsets exceeding a week (which seems a bit arbitrary,but not because it's too tight ...). This led to possibly settingsession_timezone to NULL, which results in crashes in most timezone-relatedoperations as of 9.4, and crashes in a small number of places even beforethat. So check for NULL return from pg_tzset_offset() and report anappropriate 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.)
1 parentf7ba173 commit7672bbc

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

‎src/backend/commands/variable.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,13 @@ check_timezone(char **newval, void **extra, GucSource source)
373373
}
374374
}
375375

376+
/* Test for failure in pg_tzset_offset, which we assume is out-of-range */
377+
if (!myextra.session_timezone)
378+
{
379+
GUC_check_errdetail("UTC timezone offset is out of range.");
380+
return false;
381+
}
382+
376383
/*
377384
* Prepare the canonical string to return. GUC wants it malloc'd.
378385
*

‎src/timezone/pgtz.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@ pg_tzset(const char *name)
296296
* The GMT offset is specified in seconds, positive values meaning west of
297297
* Greenwich (ie, POSIX not ISO sign convention). However, we use ISO
298298
* sign convention in the displayable abbreviation for the zone.
299+
*
300+
* Caution: this can fail (return NULL) if the specified offset is outside
301+
* the range allowed by the zic library.
299302
*/
300303
pg_tz*
301304
pg_tzset_offset(longgmtoffset)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp