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:56:40 +0300 |
| commit | 3e291cab0829f48215061a67cc07371cca3cf2e1 (patch) | |
| tree | 20c9ebf75f5cbadf4d2ee5bf90195e558bf2307e /src | |
| parent | 54152d0faa2bf31930d6eede80bac12bafa21232 (diff) | |
Fix access past end of string in date parsing.
This affects date_in(), and a couple of other funcions that use DecodeDate().
Hitoshi Harada
Diffstat (limited to 'src')
| -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 a74dce79f50..899aeb7ae71 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -2168,9 +2168,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)) { |