From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 17 May 2005 17:31:24 +0000 (+0000)
Subject: Guard against duplicate IDs in input file in SortTocFromFile().
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce93521be046c6438baebdf19d894a4caafc4866;p=thirdparty%2Fpostgresql.git

Guard against duplicate IDs in input file in SortTocFromFile().
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
index 39cabdbac66..839535f8353 100644
--- 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)