database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-01 01:04:50 +03:00
Code

Modernize zic's test for valid timezone abbreviations.

Browse Source 
We really need to sync all of our IANA-derived timezone code with upstream,
but that's going to be a large patch and I certainly don't care to shove
such a thing into stable branches immediately before a release.  As a
stopgap, copy just the tzcode2016c logic that checks validity of timezone
abbreviations.  This prevents getting multiple "time zone abbreviation
differs from POSIX standard" bleats with tzdata 2014b and later.
This commit is contained in:
Tom Lane 2016-03-26 15:58:44 -04:00
parent 31d02ebf74
commit 12aa56d4d6
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/timezone/zic.c
View File

@ -2792,30 +2792,15 @@ newabbr(const char *string)
const char *cp; const char *cp;
char *wp; char *wp;
/*
* Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics optionally
* followed by a + or - and a number from 1 to 14.
*/
cp = string; cp = string;
wp = NULL; wp = NULL;
while (isascii((unsigned char) *cp) && while (isalpha((unsigned char) *cp) || ('0' <= *cp && *cp <= '9')
isalpha((unsigned char) *cp)) || *cp == '-' || *cp == '+')
++cp; ++cp;
if (cp - string == 0) if (noise && cp - string < 3)
wp = _("time zone abbreviation lacks alphabetic at start"); wp = _("time zone abbreviation has fewer than 3 characters");
if (noise && cp - string > 3)
wp = _("time zone abbreviation has more than 3 alphabetics");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
wp = _("time zone abbreviation has too many alphabetics"); wp = _("time zone abbreviation has too many characters");
if (wp == NULL && (*cp == '+' || *cp == '-'))
{
++cp;
if (isascii((unsigned char) *cp) &&
isdigit((unsigned char) *cp))
if (*cp++ == '1' &&
*cp >= '0' && *cp <= '4')
++cp;
}
if (*cp != '\0') if (*cp != '\0')
wp = _("time zone abbreviation differs from POSIX standard"); wp = _("time zone abbreviation differs from POSIX standard");
if (wp != NULL) if (wp != NULL)