Fix access past end of string in date parsing.

hlinnaka · hlinnaka · commit 3e291cab0829 · 2012-10-02T10:56:40.000+03:00
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
@@ -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))
 		{

Original file line number	Diff line number	Diff line change
`@@ -2168,9 +2168,12 @@ DecodeDate(char str, int fmask, int tmask, bool *is2digits,`
`2168`	`2168`	`while (*str != '\0' && nf < MAXDATEFIELDS)`
`2169`	`2169`	`{`
`2170`	`2170`	`/* skip field separators */`
`2171`		`- while (!isalnum((unsigned char) *str))`
	`2171`	`+ while (str != '\0' && !isalnum((unsigned char) str))`
`2172`	`2172`	`str++;`
`2173`	`2173`
	`2174`	`+ if (*str == '\0')`
	`2175`	`+ return DTERR_BAD_FORMAT; /* end of string after separator */`
	`2176`	`+`
`2174`	`2177`	`field[nf] = str;`
`2175`	`2178`	`if (isdigit((unsigned char) *str))`
`2176`	`2179`	`{`