Commit9f3c840

committed

8268361: Fix the infinite loop in next_line

Backport-of: 72672277e4dddf8e72f1c705cd5f57de40745635

1 parent4003db8 commit9f3c840Copy full SHA for 9f3c840

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,13 @@ static struct perfbuf {`
`63`	`63`	`#defineDEC_64 "%"SCNd64`
`64`	`64`	`#defineNS_PER_SEC 1000000000`
`65`	`65`
`66`		`-staticvoidnext_line(FILE*f) {`
`67`		`-while (fgetc(f)!='\n');`
	`66`	`+staticintnext_line(FILE*f) {`
	`67`	`+intc;`
	`68`	`+do {`
	`69`	`+c=fgetc(f);`
	`70`	`+ }while (c!='\n'&&c!=EOF);`
	`71`	`+`
	`72`	`+returnc;`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`/**`
`@@ -93,7 +98,10 @@ static int get_totalticks(int which, ticks *pticks) {`
`93`	`98`	`&iowTicks,&irqTicks,&sirqTicks);`
`94`	`99`
`95`	`100`	`// Move to next line`
`96`		`-next_line(fh);`
	`101`	`+if (next_line(fh)==EOF) {`
	`102`	`+fclose(fh);`
	`103`	`+return-2;`
	`104`	`+ }`
`97`	`105`
`98`	`106`	`//find the line for requested cpu faster to just iterate linefeeds?`
`99`	`107`	`if (which!=-1) {`
`@@ -106,7 +114,10 @@ static int get_totalticks(int which, ticks *pticks) {`
`106`	`114`	`fclose(fh);`
`107`	`115`	`return-2;`
`108`	`116`	`}`
`109`		`-next_line(fh);`
	`117`	`+if (next_line(fh)==EOF) {`
	`118`	`+fclose(fh);`
	`119`	`+return-2;`
	`120`	`+ }`
`110`	`121`	`}`
`111`	`122`	`n=fscanf(fh,"cpu%*d "DEC_64" "DEC_64" "DEC_64" "DEC_64" "`
`112`	`123`	`DEC_64" "DEC_64" "DEC_64"\n",`

Comments

(0)