database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.144 2007/03/26 16:58:39 tgl Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.145 2007/08/06 01:38:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1472,7 +1472,7 @@ ReadStr(ArchiveHandle *AH)
int l; int l;
l = ReadInt(AH); l = ReadInt(AH);
if (l == -1) if (l < 0)
buf = NULL; buf = NULL;
else else
{ {
@ -1480,7 +1480,9 @@ ReadStr(ArchiveHandle *AH)
if (!buf) if (!buf)
die_horribly(AH, modulename, "out of memory\n"); die_horribly(AH, modulename, "out of memory\n");
(*AH->ReadBufPtr) (AH, (void *) buf, l); if ((*AH->ReadBufPtr) (AH, (void *) buf, l) != l)
die_horribly(AH, modulename, "unexpected end of file\n");
buf[l] = '\0'; buf[l] = '\0';
} }
@ -2675,8 +2677,8 @@ ReadHead(ArchiveHandle *AH)
/* If we haven't already read the header... */ /* If we haven't already read the header... */
if (!AH->readHeader) if (!AH->readHeader)
{ {
if ((*AH->ReadBufPtr) (AH, tmpMag, 5) != 5)
(*AH->ReadBufPtr) (AH, tmpMag, 5); die_horribly(AH, modulename, "unexpected end of file\n");
if (strncmp(tmpMag, "PGDMP", 5) != 0) if (strncmp(tmpMag, "PGDMP", 5) != 0)
die_horribly(AH, modulename, "did not find magic string in file header\n"); die_horribly(AH, modulename, "did not find magic string in file header\n");

9
src/bin/pg_dump/pg_backup_custom.c
View File

@ -19,7 +19,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.38 2007/03/18 16:50:44 neilc Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.39 2007/08/06 01:38:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -712,7 +712,7 @@ _WriteByte(ArchiveHandle *AH, const int i)
* *
* Called by the archiver to read bytes & integers from the archive. * Called by the archiver to read bytes & integers from the archive.
* These routines are only used to read & write headers & TOC. * These routines are only used to read & write headers & TOC.
* * EOF should be treated as a fatal error.
*/ */
static int static int
_ReadByte(ArchiveHandle *AH) _ReadByte(ArchiveHandle *AH)
@ -720,8 +720,9 @@ _ReadByte(ArchiveHandle *AH)
lclContext *ctx = (lclContext *) AH->formatData; lclContext *ctx = (lclContext *) AH->formatData;
int res; int res;
res = fgetc(AH->FH); res = getc(AH->FH);
if (res != EOF) if (res == EOF)
die_horribly(AH, modulename, "unexpected end of file\n");
ctx->filePos += 1; ctx->filePos += 1;
return res; return res;
} }

7
src/bin/pg_dump/pg_backup_files.c
View File

@ -20,7 +20,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.32 2007/03/18 16:50:44 neilc Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.33 2007/08/06 01:38:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -395,8 +395,9 @@ _ReadByte(ArchiveHandle *AH)
lclContext *ctx = (lclContext *) AH->formatData; lclContext *ctx = (lclContext *) AH->formatData;
int res; int res;
res = fgetc(AH->FH); res = getc(AH->FH);
if (res != EOF) if (res == EOF)
die_horribly(AH, modulename, "unexpected end of file\n");
ctx->filePos += 1; ctx->filePos += 1;
return res; return res;
} }

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

@ -16,7 +16,7 @@
* *
* *
* IDENTIFICATION * 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; used = avail;
/* Copy, and adjust buffer pos */ /* Copy, and adjust buffer pos */
memcpy(buf, AH->lookahead, used); memcpy(buf, AH->lookahead + AH->lookaheadPos, used);
AH->lookaheadPos += used; AH->lookaheadPos += used;
/* Adjust required length */ /* Adjust required length */
@ -766,12 +766,13 @@ static int
_ReadByte(ArchiveHandle *AH) _ReadByte(ArchiveHandle *AH)
{ {
lclContext *ctx = (lclContext *) AH->formatData; lclContext *ctx = (lclContext *) AH->formatData;
int res; size_t res;
char c = '\0'; unsigned char c;
res = tarRead(&c, 1, ctx->FH); res = tarRead(&c, 1, ctx->FH);
if (res != EOF) if (res != 1)
ctx->filePos += res; die_horribly(AH, modulename, "unexpected end of file\n");
ctx->filePos += 1;
return c; return c;
} }