Fix file descriptor leak after failure of a \setshell command in pgbench.

tglsfdc · tglsfdc · commit 6c75384eed87 · 2014-12-16T13:31:57.000-05:00
If the called command fails to return data, runShellCommand forgot to
pclose() the pipe before returning.  This is fairly harmless in the current
code, because pgbench would then abandon further processing of that client
thread; so no more than nclients descriptors could be leaked this way.  But
it's not hard to imagine future improvements whereby that wouldn't be true.
In any case, it's sloppy coding, so patch all branches.  Found by Coverity.
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -863,6 +863,7 @@ runShellCommand(CState *st, char *variable, char **argv, int argc)
 	{
 		if (!timer_exceeded)
 			fprintf(stderr, "%s: cannot read the result\n", argv[0]);
+		(void) pclose(fp);
 		return false;
 	}
 	if (pclose(fp) < 0)

Original file line number	Diff line number	Diff line change
`@@ -863,6 +863,7 @@ runShellCommand(CState st, char variable, char **argv, int argc)`
`863`	`863`	`{`
`864`	`864`	`if (!timer_exceeded)`
`865`	`865`	`fprintf(stderr, "%s: cannot read the result\n", argv[0]);`
	`866`	`+ (void) pclose(fp);`
`866`	`867`	`return false;`
`867`	`868`	`}`
`868`	`869`	`if (pclose(fp) < 0)`