Commit6c00b2b

committed

Fix access past end of string in date parsing.

This affects date_in(), and a couple of other funcions that use DecodeDate().Hitoshi Harada

1 parentd617b28 commit6c00b2bCopy full SHA for 6c00b2b

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

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

Comments

(0)