Commit4335c95

committed

Fix improperly passed file descriptors

Fix for commit14ea893Report by Andres Freund

1 parent0a78320 commit4335c95Copy full SHA for 4335c95

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -558,15 +558,15 @@ _tarReadRaw(ArchiveHandle AH, void buf, size_t len, TAR_MEMBER th, FILE fh)`
`558`	`558`	`if (th->zFH)`
`559`	`559`	`{`
`560`	`560`	`res=GZREAD(&((char*)buf)[used],1,len,th->zFH);`
`561`		`-if (res!=len&& !GZEOF(fh))`
	`561`	`+if (res!=len&& !GZEOF(th->zFH))`
`562`	`562`	`exit_horribly(modulename,`
`563`	`563`	`"could not read from input file: %s\n",strerror(errno));`
`564`	`564`	`}`
`565`	`565`	`else`
`566`	`566`	`{`
`567`	`567`	`res=fread(&((char*)buf)[used],1,len,th->nFH);`
`568`		`-if (res!=len&& !feof(fh))`
`569`		`-READ_ERROR_EXIT(fh);`
	`568`	`+if (res!=len&& !feof(th->nFH))`
	`569`	`+READ_ERROR_EXIT(th->nFH);`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`	`else`

Comments

(0)