Properly close files after read file failure to prevent potential

bmomjian · bmomjian · commit f17588452094 · 2010-09-28T19:28:34.000Z
resource leak.  Of course, any such failure aborts pg_upgrade, but might
as well be clean about it.

Per patch from Grzegorz Ja?kiewicz.
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -74,7 +74,10 @@ copyAndUpdateFile(migratorContext *ctx, pageCnvCtx *pageConverter,
 				return "can't open source file";
 
 			if ((dstfd = open(dst, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
+			{
+				fclose(src_fd);
 				return "can't create destination file";
+			}
 
 			while ((bytesRead = read(src_fd, buf, BLCKSZ)) == BLCKSZ)
 			{
diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c
@@ -103,7 +103,10 @@ getPageVersion(migratorContext *ctx, uint16 *version, const char *pathName)
 		return "can't open relation";
 
 	if ((bytesRead = read(relfd, &page, sizeof(page))) != sizeof(page))
+	{
+		close(relfd);
 		return "can't read page header";
+	}
 
 	*version = PageGetPageLayoutVersion(&page);
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,10 @@ copyAndUpdateFile(migratorContext ctx, pageCnvCtx pageConverter,`
`74`	`74`	`return "can't open source file";`
`75`	`75`
`76`	`76`	`if ((dstfd = open(dst, O_RDWR \| O_CREAT \| O_EXCL, S_IRUSR \| S_IWUSR)) < 0)`
	`77`	`+ {`
	`78`	`+ fclose(src_fd);`
`77`	`79`	`return "can't create destination file";`
	`80`	`+ }`
`78`	`81`
`79`	`82`	`while ((bytesRead = read(src_fd, buf, BLCKSZ)) == BLCKSZ)`
`80`	`83`	`{`