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 26c6742e8b10d8476589873cbcb38f25633079c9..202763b1c7fa195e865b28140d0c575e363e523b 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -2165,9 +2165,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))
        {