Free PQresult on error in pg_receivexlog.

hlinnaka · hlinnaka · commit c890b488063e · 2014-05-12T11:01:26.000+03:00
The leak is fairly small and rare, but a leak nevertheless.

Per Coverity report. Backpatch to 9.2, where pg_receivexlog was added.
pg_basebackup shares the code, but it always exits on error, so there is
no real leak.
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -858,6 +858,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 				if (!close_walfile(basedir, partial_suffix, blockpos))
 				{
 					/* Error message written in close_walfile() */
+					PQclear(res);
 					goto error;
 				}
 				if (PQresultStatus(res) == PGRES_COPY_IN)
@@ -867,6 +868,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 						fprintf(stderr,
 								_("%s: could not send copy-end packet: %s"),
 								progname, PQerrorMessage(conn));
+						PQclear(res);
 						goto error;
 					}
 					res = PQgetResult(conn);

Original file line number	Diff line number	Diff line change
`@@ -858,6 +858,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`858`	`858`	`if (!close_walfile(basedir, partial_suffix, blockpos))`
`859`	`859`	`{`
`860`	`860`	`/* Error message written in close_walfile() */`
	`861`	`+ PQclear(res);`
`861`	`862`	`goto error;`
`862`	`863`	`}`
`863`	`864`	`if (PQresultStatus(res) == PGRES_COPY_IN)`
`@@ -867,6 +868,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`867`	`868`	`fprintf(stderr,`
`868`	`869`	`_("%s: could not send copy-end packet: %s"),`
`869`	`870`	`progname, PQerrorMessage(conn));`
	`871`	`+ PQclear(res);`
`870`	`872`	`goto error;`
`871`	`873`	`}`
`872`	`874`	`res = PQgetResult(conn);`