pg_restore failed on tar-format archives if they contained large objects

tglsfdc · tglsfdc · commit 19d0c46def86 · 2006-11-01T15:59:26.000Z
(blobs) with comments, per bug #2727 from Konstantin Pelepelin.
Mea culpa for not having tested this case.
Back-patch to 8.1; prior branches don't dump blob comments at all.
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.55 2006/10/04 00:30:05 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.56 2006/11/01 15:59:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -701,6 +701,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 	lclContext *ctx = (lclContext *) AH->formatData;
 	TAR_MEMBER *th;
 	size_t		cnt;
+	bool		foundBlob = false;
 	char		buf[4096];
 
 	StartRestoreBlobs(AH);
@@ -725,10 +726,22 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 					ahwrite(buf, 1, cnt, AH);
 				}
 				EndRestoreBlob(AH, oid);
+				foundBlob = true;
 			}
+			tarClose(AH, th);
+		}
+		else
+		{
+			tarClose(AH, th);
+			/*
+			 * Once we have found the first blob, stop at the first
+			 * non-blob entry (which will be 'blobs.toc').  This coding would
+			 * eat all the rest of the archive if there are no blobs ... but
+			 * this function shouldn't be called at all in that case.
+			 */
+			if (foundBlob)
+				break;
 		}
-
-		tarClose(AH, th);
 
 		th = tarOpen(AH, NULL, 'r');
 	}

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.55 2006/10/04 00:30:05 momjian Exp $`
	`19`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.56 2006/11/01 15:59:26 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -701,6 +701,7 @@ _LoadBlobs(ArchiveHandle AH, RestoreOptions ropt)`
`701`	`701`	`lclContext ctx = (lclContext ) AH->formatData;`
`702`	`702`	`TAR_MEMBER *th;`
`703`	`703`	`size_t cnt;`
	`704`	`+ bool foundBlob = false;`
`704`	`705`	`char buf[4096];`
`705`	`706`
`706`	`707`	`StartRestoreBlobs(AH);`
`@@ -725,10 +726,22 @@ _LoadBlobs(ArchiveHandle AH, RestoreOptions ropt)`
`725`	`726`	`ahwrite(buf, 1, cnt, AH);`
`726`	`727`	`}`
`727`	`728`	`EndRestoreBlob(AH, oid);`
	`729`	`+ foundBlob = true;`
`728`	`730`	`}`
	`731`	`+ tarClose(AH, th);`
	`732`	`+ }`
	`733`	`+ else`
	`734`	`+ {`
	`735`	`+ tarClose(AH, th);`
	`736`	`+ /*`
	`737`	`+ * Once we have found the first blob, stop at the first`
	`738`	`+ * non-blob entry (which will be 'blobs.toc'). This coding would`
	`739`	`+ * eat all the rest of the archive if there are no blobs ... but`
	`740`	`+ * this function shouldn't be called at all in that case.`
	`741`	`+ */`
	`742`	`+ if (foundBlob)`
	`743`	`+ break;`
`729`	`744`	`}`
`730`		`-`
`731`		`- tarClose(AH, th);`
`732`	`745`
`733`	`746`	`th = tarOpen(AH, NULL, 'r');`
`734`	`747`	`}`