Free PQresult on error in pg_receivexlog.

hlinnaka · hlinnaka · commit 0ad78306be6b · 2014-05-12T10:59:08.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
@@ -912,6 +912,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 				if (!close_walfile(basedir, partial_suffix))
 				{
 					/* Error message written in close_walfile() */
+					PQclear(res);
 					goto error;
 				}
 				if (PQresultStatus(res) == PGRES_COPY_IN)
@@ -921,6 +922,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
`@@ -912,6 +912,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`912`	`912`	`if (!close_walfile(basedir, partial_suffix))`
`913`	`913`	`{`
`914`	`914`	`/* Error message written in close_walfile() */`
	`915`	`+ PQclear(res);`
`915`	`916`	`goto error;`
`916`	`917`	`}`
`917`	`918`	`if (PQresultStatus(res) == PGRES_COPY_IN)`
`@@ -921,6 +922,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`921`	`922`	`fprintf(stderr,`
`922`	`923`	`_("%s: could not send copy-end packet: %s"),`
`923`	`924`	`progname, PQerrorMessage(conn));`
	`925`	`+ PQclear(res);`
`924`	`926`	`goto error;`
`925`	`927`	`}`
`926`	`928`	`res = PQgetResult(conn);`