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_tar.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_tar.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_tar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index adb5eba895b..f20fddae6aa 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.46.4.2 2005/06/22 02:02:09 neilc Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.46.4.3 2007/08/06 01:38:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -483,7 +483,7 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh) used = avail; /* Copy, and adjust buffer pos */ - memcpy(buf, AH->lookahead, used); + memcpy(buf, AH->lookahead + AH->lookaheadPos, used); AH->lookaheadPos += used; /* Adjust required length */ @@ -727,12 +727,13 @@ static int _ReadByte(ArchiveHandle *AH) { lclContext *ctx = (lclContext *) AH->formatData; - int res; - char c = '\0'; + size_t res; + unsigned char c; res = tarRead(&c, 1, ctx->FH); - if (res != EOF) - ctx->filePos += res; + if (res != 1) + die_horribly(AH, modulename, "unexpected end of file\n"); + ctx->filePos += 1; return c; } |