From: Heikki Linnakangas Date: Tue, 2 Oct 2012 07:43:48 +0000 (+0300) Subject: Fix access past end of string in date parsing. X-Git-Tag: REL8_3_22~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61540e6d71764cd595bef7add8d7c5a329547448;p=thirdparty%2Fpostgresql.git Fix access past end of string in date parsing. This affects date_in(), and a couple of other funcions that use DecodeDate(). Hitoshi Harada --- diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 184c8f441b0..c91a8021758 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -2061,9 +2061,12 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits, while (*str != '\0' && nf < MAXDATEFIELDS) { /* skip field separators */ - while (!isalnum((unsigned char) *str)) + while (*str != '\0' && !isalnum((unsigned char) *str)) str++; + if (*str == '\0') + return DTERR_BAD_FORMAT; /* end of string after separator */ + field[nf] = str; if (isdigit((unsigned char) *str)) {