Commitfcb9535

committed

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

Per report and partial patch from Chad Wagner.

1 parentdf9ea6a commitfcb9535Copy full SHA for fcb9535

File tree

+25

-20

lines changed

+25

-20

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.144 2007/03/26 16:58:39 tgl Exp $`
	`18`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.145 2007/08/06 01:38:14 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1472,15 +1472,17 @@ ReadStr(ArchiveHandle *AH)`
`1472`	`1472`	`intl;`
`1473`	`1473`
`1474`	`1474`	`l=ReadInt(AH);`
`1475`		`-if (l==-1)`
	`1475`	`+if (l<0)`
`1476`	`1476`	`buf=NULL;`
`1477`	`1477`	`else`
`1478`	`1478`	`{`
`1479`	`1479`	`buf= (char*)malloc(l+1);`
`1480`	`1480`	`if (!buf)`
`1481`	`1481`	`die_horribly(AH,modulename,"out of memory\n");`
`1482`	`1482`
`1483`		`-(AH->ReadBufPtr) (AH, (void)buf,l);`
	`1483`	`+if ((AH->ReadBufPtr) (AH, (void)buf,l)!=l)`
	`1484`	`+die_horribly(AH,modulename,"unexpected end of file\n");`
	`1485`	`+`
`1484`	`1486`	`buf[l]='\0';`
`1485`	`1487`	`}`
`1486`	`1488`
`@@ -2675,8 +2677,8 @@ ReadHead(ArchiveHandle *AH)`
`2675`	`2677`	`/* If we haven't already read the header... */`
`2676`	`2678`	`if (!AH->readHeader)`
`2677`	`2679`	`{`
`2678`		`-`
`2679`		`-(*AH->ReadBufPtr) (AH,tmpMag,5);`
	`2680`	`+if ((*AH->ReadBufPtr) (AH,tmpMag,5)!=5)`
	`2681`	`+die_horribly(AH,modulename,"unexpected end of file\n");`
`2680`	`2682`
`2681`	`2683`	`if (strncmp(tmpMag,"PGDMP",5)!=0)`
`2682`	`2684`	`die_horribly(AH,modulename,"did not find magic string in file header\n");`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`*`
`21`	`21`	`* IDENTIFICATION`
`22`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.38 2007/03/18 16:50:44 neilc Exp $`
	`22`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.39 2007/08/06 01:38:14 tgl Exp $`
`23`	`23`	`*`
`24`	`24`	`*-------------------------------------------------------------------------`
`25`	`25`	`*/`
`@@ -712,17 +712,18 @@ _WriteByte(ArchiveHandle *AH, const int i)`
`712`	`712`	`*`
`713`	`713`	`* Called by the archiver to read bytes & integers from the archive.`
`714`	`714`	`* These routines are only used to read & write headers & TOC.`
`715`		`- *`
	`715`	`+ * EOF should be treated as a fatal error.`
`716`	`716`	`*/`
`717`	`717`	`staticint`
`718`	`718`	`_ReadByte(ArchiveHandle*AH)`
`719`	`719`	`{`
`720`	`720`	`lclContextctx= (lclContext)AH->formatData;`
`721`	`721`	`intres;`
`722`	`722`
`723`		`-res=fgetc(AH->FH);`
`724`		`-if (res!=EOF)`
`725`		`-ctx->filePos+=1;`
	`723`	`+res=getc(AH->FH);`
	`724`	`+if (res==EOF)`
	`725`	`+die_horribly(AH,modulename,"unexpected end of file\n");`
	`726`	`+ctx->filePos+=1;`
`726`	`727`	`returnres;`
`727`	`728`	`}`
`728`	`729`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`*`
`22`	`22`	`* IDENTIFICATION`
`23`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.32 2007/03/18 16:50:44 neilc Exp $`
	`23`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.33 2007/08/06 01:38:15 tgl Exp $`
`24`	`24`	`*`
`25`	`25`	`*-------------------------------------------------------------------------`
`26`	`26`	`*/`
`@@ -395,9 +395,10 @@ _ReadByte(ArchiveHandle *AH)`
`395`	`395`	`lclContextctx= (lclContext)AH->formatData;`
`396`	`396`	`intres;`
`397`	`397`
`398`		`-res=fgetc(AH->FH);`
`399`		`-if (res!=EOF)`
`400`		`-ctx->filePos+=1;`
	`398`	`+res=getc(AH->FH);`
	`399`	`+if (res==EOF)`
	`400`	`+die_horribly(AH,modulename,"unexpected end of file\n");`
	`401`	`+ctx->filePos+=1;`
`401`	`402`	`returnres;`
`402`	`403`	`}`
`403`	`404`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*`
`18`	`18`	`* IDENTIFICATION`
`19`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.58 2007/03/18 16:50:44 neilc Exp $`
	`19`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.59 2007/08/06 01:38:15 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -510,7 +510,7 @@ _tarReadRaw(ArchiveHandle AH, void buf, size_t len, TAR_MEMBER th, FILE fh)`
`510`	`510`	`used=avail;`
`511`	`511`
`512`	`512`	`/* Copy, and adjust buffer pos */`
`513`		`-memcpy(buf,AH->lookahead,used);`
	`513`	`+memcpy(buf,AH->lookahead+AH->lookaheadPos,used);`
`514`	`514`	`AH->lookaheadPos+=used;`
`515`	`515`
`516`	`516`	`/* Adjust required length */`
`@@ -766,12 +766,13 @@ static int`
`766`	`766`	`_ReadByte(ArchiveHandle*AH)`
`767`	`767`	`{`
`768`	`768`	`lclContextctx= (lclContext)AH->formatData;`
`769`		`-intres;`
`770`		`-charc='\0';`
	`769`	`+size_tres;`
	`770`	`+unsignedcharc;`
`771`	`771`
`772`	`772`	`res=tarRead(&c,1,ctx->FH);`
`773`		`-if (res!=EOF)`
`774`		`-ctx->filePos+=res;`
	`773`	`+if (res!=1)`
	`774`	`+die_horribly(AH,modulename,"unexpected end of file\n");`
	`775`	`+ctx->filePos+=1;`
`775`	`776`	`returnc;`
`776`	`777`	`}`
`777`	`778`

Comments

(0)