pg_restore: Fix memory and file descriptor leak with directory format

petere · petere · commit d8e5b3427a0f · 2012-03-16T20:34:59.000+02:00
found by Coverity
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
@@ -356,6 +356,9 @@ _PrintFileData(ArchiveHandle *AH, char *filename, RestoreOptions *ropt)
 		ahwrite(buf, 1, cnt, AH);
 
 	free(buf);
+	if (cfclose(cfp) != 0)
+		die_horribly(AH, modulename, "could not close data file: %s\n",
+					 strerror(errno));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,9 @@ _PrintFileData(ArchiveHandle AH, char filename, RestoreOptions *ropt)`
`356`	`356`	`ahwrite(buf, 1, cnt, AH);`
`357`	`357`
`358`	`358`	`free(buf);`
	`359`	`+ if (cfclose(cfp) != 0)`
	`360`	`+ die_horribly(AH, modulename, "could not close data file: %s\n",`
	`361`	`+ strerror(errno));`
`359`	`362`	`}`
`360`	`363`
`361`	`364`	`/*`