rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix improperly passed file descriptors 

Fix for commit 14ea89366f

Report by Andres Freund
This commit is contained in:
Bruce Momjian 2014-05-06 12:20:51 -04:00
parent 0a78320057
commit 4335c95815
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/pg_dump/pg_backup_tar.c
View File

@ -558,15 +558,15 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
if (th->zFH) if (th->zFH)
{ {
res = GZREAD(&((char *) buf)[used], 1, len, 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, exit_horribly(modulename,
"could not read from input file: %s\n", strerror(errno)); "could not read from input file: %s\n", strerror(errno));
} }
else else
{ {
res = fread(&((char *) buf)[used], 1, len, th->nFH); res = fread(&((char *) buf)[used], 1, len, th->nFH);
if (res != len && !feof(fh)) if (res != len && !feof(th->nFH))
READ_ERROR_EXIT(fh); READ_ERROR_EXIT(th->nFH);
} }
} }
else else