diff options
author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-10-02 10:43:48 +0300 |
---|---|---|
committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-10-02 10:47:39 +0300 |
commit | 6c00b2bbf7726efdf7d96ad5c9e9ef0450d2a150 (patch) | |
tree | 778521ccdea280481992e3a17c7dba70df9172d1 | |
parent | d617b28c6cc315d1aa1a4855673dd9eb121dcf73 (diff) | |
download | postgresql-6c00b2bbf7726efdf7d96ad5c9e9ef0450d2a150.tar.gz postgresql-6c00b2bbf7726efdf7d96ad5c9e9ef0450d2a150.zip |
Fix access past end of string in date parsing.
This affects date_in(), and a couple of other funcions that use DecodeDate().
Hitoshi Harada
-rw-r--r-- | src/backend/utils/adt/datetime.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index a3be406b684..e4866ce26c0 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -2169,9 +2169,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)) { |