mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki 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:24 +00:00
parent fffafc5dca
commit f614a2b508
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
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.138.2.1 2007/02/19 15:05:21 mha Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.138.2.2 2007/08/06 01:38:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1462,7 +1462,7 @@ ReadStr(ArchiveHandle *AH)
int l;
l = ReadInt(AH);
if (l == -1)
if (l < 0)
buf = NULL;
else
{
@ -1470,7 +1470,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';
}
@ -2662,8 +2664,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
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.36.2.1 2007/02/19 15:05:21 mha Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.36.2.2 2007/08/06 01:38:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -712,7 +712,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)
@ -720,9 +720,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
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.29.2.1 2007/02/19 15:05:21 mha Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.29.2.2 2007/08/06 01:38:24 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
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.56.2.1 2007/02/19 15:05:21 mha Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.56.2.2 2007/08/06 01:38:24 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;
}