Fix inconsequential fd leak in the new mark_file_as_archived() function.

anarazel · anarazel · commit ec14f16014ec · 2015-01-04T14:36:22.000+01:00
As every error in mark_file_as_archived() will lead to a failure of
pg_basebackup the FD leak couldn't ever lead to a real problem.  It
seems better to fix the leak anyway though, rather than silence
Coverity, as the usage of the function might get extended or copied at
some point in the future.

Pointed out by Coverity.

Backpatch to 9.2, like the relevant part of the previous patch.
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -62,6 +62,9 @@ mark_file_as_archived(const char *basedir, const char *fname)
 	{
 		fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"),
 				progname, tmppath, strerror(errno));
+
+		close(fd);
+
 		return false;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ mark_file_as_archived(const char basedir, const char fname)`
`62`	`62`	`{`
`63`	`63`	`fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"),`
`64`	`64`	`progname, tmppath, strerror(errno));`
	`65`	`+`
	`66`	`+ close(fd);`
	`67`	`+`
`65`	`68`	`return false;`
`66`	`69`	`}`
`67`	`70`