1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard against duplicate IDs in input file in SortTocFromFile().

Browse Source 
Per report from Brian Hackett.
This commit is contained in:
Tom Lane 2005-05-17 17:31:24 +00:00
parent 6a36111eca
commit ce93521be0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.42.2.1 2005/04/30 09:08:14 neilc Exp $
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.42.2.2 2005/05/17 17:31:24 tgl Exp $
*
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
*
@ -982,7 +982,7 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
if (!fh)
die_horribly(AH, modulename, "could not open TOC file\n");
while (fgets(buf, 1024, fh) != NULL)
while (fgets(buf, sizeof(buf), fh) != NULL)
{
/* Find a comment */
cmnt = strchr(buf, ';');
@ -1010,11 +1010,14 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
if (!te)
die_horribly(AH, modulename, "could not find entry for id %d\n", id);
if (!ropt->idWanted[id - 1])
{
ropt->idWanted[id - 1] = 1;
_moveAfter(AH, tePrev, te);
tePrev = te;
}
}
if (fclose(fh) != 0)
die_horribly(AH, modulename, "could not close TOC file: %s\n", strerror(errno));