Commit3a5d0c5

committed

Avoid reading below the start of a stack variable in tokenize_file().

We would wrongly overwrite the prior stack byte if it happened tocontain '\n' or '\r'. New in 9.3, so no back-patch.

1 parent813895e commit3a5d0c5Copy full SHA for 3a5d0c5

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,9 +411,9 @@ tokenize_file(const char filename, FILE file,`
`411`	`411`	`line_number,filename)));`
`412`	`412`
`413`	`413`	`/* Strip trailing linebreak from rawline */`
`414`		`-while (rawline[strlen(rawline)-1]=='\n'\|\|`
`415`		`-rawline[strlen(rawline)-1]=='\r')`
`416`		`-rawline[strlen(rawline)-1]='\0';`
	`414`	`+lineptr=rawline+strlen(rawline)-1;`
	`415`	`+while (lineptr >=rawline&& (lineptr=='\n'\|\|lineptr=='\r'))`
	`416`	`+*lineptr--='\0';`
`417`	`417`
`418`	`418`	`lineptr=rawline;`
`419`	`419`	`while (strlen(lineptr)>0)`

Comments

(0)