upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-28 04:35:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:49 +00:00
parent 3ca3c71141
commit b58230005b
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
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.79.2.6 2005/08/25 00:11:36 tgl Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.79.2.7 2007/08/06 01:38:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1526,7 +1526,7 @@ ReadStr(ArchiveHandle *AH)
int l;
l = ReadInt(AH);
if (l == -1)
if (l < 0)
buf = NULL;
else
{
@ -1534,7 +1534,9 @@ ReadStr(ArchiveHandle *AH)
if (!buf)
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';
}
@ -2323,8 +2325,8 @@ ReadHead(ArchiveHandle *AH)
/* If we haven't already read the header... */
if (!AH->readHeader)
{
(*AH->ReadBufPtr) (AH, tmpMag, 5);
if ((*AH->ReadBufPtr) (AH, tmpMag, 5) != 5)
die_horribly(AH, modulename, "unexpected end of file\n");
if (strncmp(tmpMag, "PGDMP", 5) != 0)
die_horribly(AH, modulename, "did not find magic string in file header\n");

11
src/bin/pg_dump/pg_backup_custom.c
View file

@ -19,7 +19,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.26 2003/10/08 03:52:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.26.2.1 2007/08/06 01:38:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -713,7 +713,7 @@ _WriteByte(ArchiveHandle *AH, const int i)
*
* Called by the archiver to read bytes & integers from the archive.
* These routines are only used to read & write headers & TOC.
*
* EOF should be treated as a fatal error.
*/
static int
_ReadByte(ArchiveHandle *AH)
@ -721,9 +721,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;
}

9
src/bin/pg_dump/pg_backup_files.c
View file

@ -20,7 +20,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.22 2003/10/08 03:52:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.22.2.1 2007/08/06 01:38:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -396,9 +396,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;
}

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

@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.38.2.1 2005/06/22 02:12:19 neilc Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.38.2.2 2007/08/06 01:38:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -485,7 +485,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 */
@ -729,12 +729,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;
}