Add missing PQclear() calls into pg_receivexlog.

MasaoFujii · MasaoFujii · commit b819dd7cb55a · 2014-08-02T15:18:09.000+09:00
Back-patch to 9.3.
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -628,6 +628,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 				fprintf(stderr,
 				   _("%s: unexpected termination of replication stream: %s"),
 						progname, PQresultErrorMessage(res));
+				PQclear(res);
 				goto error;
 			}
 			PQclear(res);
@@ -642,6 +643,8 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 		}
 		else if (PQresultStatus(res) == PGRES_COMMAND_OK)
 		{
+			PQclear(res);
+
 			/*
 			 * End of replication (ie. controlled shut down of the server).
 			 *
@@ -663,6 +666,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 			fprintf(stderr,
 					_("%s: unexpected termination of replication stream: %s"),
 					progname, PQresultErrorMessage(res));
+			PQclear(res);
 			goto error;
 		}
 	}
@@ -839,6 +843,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 						PQclear(res);
 						goto error;
 					}
+					PQclear(res);
 					res = PQgetResult(conn);
 				}
 				still_sending = false;

Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`628`	`628`	`fprintf(stderr,`
`629`	`629`	`_("%s: unexpected termination of replication stream: %s"),`
`630`	`630`	`progname, PQresultErrorMessage(res));`
	`631`	`+ PQclear(res);`
`631`	`632`	`goto error;`
`632`	`633`	`}`
`633`	`634`	`PQclear(res);`
`@@ -642,6 +643,8 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`642`	`643`	`}`
`643`	`644`	`else if (PQresultStatus(res) == PGRES_COMMAND_OK)`
`644`	`645`	`{`
	`646`	`+ PQclear(res);`
	`647`	`+`
`645`	`648`	`/*`
`646`	`649`	`* End of replication (ie. controlled shut down of the server).`
`647`	`650`	`*`
`@@ -663,6 +666,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`663`	`666`	`fprintf(stderr,`
`664`	`667`	`_("%s: unexpected termination of replication stream: %s"),`
`665`	`668`	`progname, PQresultErrorMessage(res));`
	`669`	`+ PQclear(res);`
`666`	`670`	`goto error;`
`667`	`671`	`}`
`668`	`672`	`}`
`@@ -839,6 +843,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`839`	`843`	`PQclear(res);`
`840`	`844`	`goto error;`
`841`	`845`	`}`
	`846`	`+ PQclear(res);`
`842`	`847`	`res = PQgetResult(conn);`
`843`	`848`	`}`
`844`	`849`	`still_sending = false;`