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

tglsfdc · tglsfdc · commit ce93521be046 · 2005-05-17T17:31:24.000Z
Per report from Brian Hackett.
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -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,10 +1010,13 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
 		if (!te)
 			die_horribly(AH, modulename, "could not find entry for id %d\n", id);
 
-		ropt->idWanted[id - 1] = 1;
+		if (!ropt->idWanted[id - 1])
+		{
+			ropt->idWanted[id - 1] = 1;
 
-		_moveAfter(AH, tePrev, te);
-		tePrev = te;
+			_moveAfter(AH, tePrev, te);
+			tePrev = te;
+		}
 	}
 
 	if (fclose(fh) != 0)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.42.2.1 2005/04/30 09:08:14 neilc Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.42.2.2 2005/05/17 17:31:24 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`21`	`21`	`*`
`@@ -982,7 +982,7 @@ SortTocFromFile(Archive AHX, RestoreOptions ropt)`
`982`	`982`	`if (!fh)`
`983`	`983`	`die_horribly(AH, modulename, "could not open TOC file\n");`
`984`	`984`
`985`		`- while (fgets(buf, 1024, fh) != NULL)`
	`985`	`+ while (fgets(buf, sizeof(buf), fh) != NULL)`
`986`	`986`	`{`
`987`	`987`	`/* Find a comment */`
`988`	`988`	`cmnt = strchr(buf, ';');`
`@@ -1010,10 +1010,13 @@ SortTocFromFile(Archive AHX, RestoreOptions ropt)`
`1010`	`1010`	`if (!te)`
`1011`	`1011`	`die_horribly(AH, modulename, "could not find entry for id %d\n", id);`
`1012`	`1012`
`1013`		`- ropt->idWanted[id - 1] = 1;`
	`1013`	`+ if (!ropt->idWanted[id - 1])`
	`1014`	`+ {`
	`1015`	`+ ropt->idWanted[id - 1] = 1;`
`1014`	`1016`
`1015`		`- _moveAfter(AH, tePrev, te);`
`1016`		`- tePrev = te;`
	`1017`	`+ _moveAfter(AH, tePrev, te);`
	`1018`	`+ tePrev = te;`
	`1019`	`+ }`
`1017`	`1020`	`}`
`1018`	`1021`
`1019`	`1022`	`if (fclose(fh) != 0)`