Fix improperly passed file descriptors

bmomjian · bmomjian · commit 4335c958154c · 2014-05-06T12:20:51.000-04:00
Fix for commit 14ea893 Report by Andres Freund
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -558,15 +558,15 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
 			if (th->zFH)
 			{
 				res = GZREAD(&((char *) buf)[used], 1, len, th->zFH);
-				if (res != len && !GZEOF(fh))
+				if (res != len && !GZEOF(th->zFH))
 					exit_horribly(modulename,
 					"could not read from input file: %s\n", strerror(errno));
 			}
 			else
 			{
 				res = fread(&((char *) buf)[used], 1, len, th->nFH);
-				if (res != len && !feof(fh))
-					READ_ERROR_EXIT(fh);
+				if (res != len && !feof(th->nFH))
+					READ_ERROR_EXIT(th->nFH);
 			}
 		}
 		else

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`