From 4335c958154c39ef99a38dc953b3f803b13a1048 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 6 May 2014 12:20:51 -0400 Subject: [PATCH] Fix improperly passed file descriptors Fix for commit 14ea89366fe321609afc5838ff9fe2ded1cd707d Report by Andres Freund --- src/bin/pg_dump/pg_backup_tar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index 0cb72650b0..aa06503fb0 100644 --- 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