diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-06 01:38:40 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-06 01:38:40 +0000 |
| commit | fbf9179a2758f721ed460f6503e36c56b82eef4c (patch) | |
| tree | dfdf19fa9ca975e50d57d8e8288861b897338685 /src/bin/pg_dump/pg_backup_files.c | |
| parent | 2e24f4af49ddf6ed4d05446c132b1e33415a26b2 (diff) | |
Fix pg_restore to guard against unexpected EOF while reading an archive file.
Per report and partial patch from Chad Wagner.
Diffstat (limited to 'src/bin/pg_dump/pg_backup_files.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_files.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c index fc096211323..80da43eff28 100644 --- a/src/bin/pg_dump/pg_backup_files.c +++ b/src/bin/pg_dump/pg_backup_files.c @@ -20,7 +20,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.25 2004/03/03 21:28:54 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.25.4.1 2007/08/06 01:38:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -397,9 +397,10 @@ _ReadByte(ArchiveHandle *AH) lclContext *ctx = (lclContext *) AH->formatData; int res; - res = fgetc(AH->FH); - if (res != EOF) - ctx->filePos += 1; + res = getc(AH->FH); + if (res == EOF) + die_horribly(AH, modulename, "unexpected end of file\n"); + ctx->filePos += 1; return res; } |