database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Fix pg_restore to guard against unexpected EOF while reading an archive file.

Browse Source 
Per report and partial patch from Chad Wagner.
This commit is contained in:
Tom Lane
2007-08-06 01:38:15 +00:00
parent df9ea6a1f1
commit fcb9535e8a
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.58 2007/03/18 16:50:44 neilc Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.59 2007/08/06 01:38:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -510,7 +510,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 */
@@ -766,12 +766,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;
}