Add missing PQclear() calls into pg_receivexlog.

MasaoFujii · MasaoFujii · commit 9747a9898518 · 2014-08-02T15:19:45.000+09:00
Back-patch to 9.3.
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -680,6 +680,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);
@@ -694,6 +695,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).
 			 *
@@ -715,6 +718,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
 			fprintf(stderr,
 					_("%s: unexpected termination of replication stream: %s"),
 					progname, PQresultErrorMessage(res));
+			PQclear(res);
 			goto error;
 		}
 	}
@@ -925,6 +929,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
`@@ -680,6 +680,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`680`	`680`	`fprintf(stderr,`
`681`	`681`	`_("%s: unexpected termination of replication stream: %s"),`
`682`	`682`	`progname, PQresultErrorMessage(res));`
	`683`	`+ PQclear(res);`
`683`	`684`	`goto error;`
`684`	`685`	`}`
`685`	`686`	`PQclear(res);`
`@@ -694,6 +695,8 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`694`	`695`	`}`
`695`	`696`	`else if (PQresultStatus(res) == PGRES_COMMAND_OK)`
`696`	`697`	`{`
	`698`	`+ PQclear(res);`
	`699`	`+`
`697`	`700`	`/*`
`698`	`701`	`* End of replication (ie. controlled shut down of the server).`
`699`	`702`	`*`
`@@ -715,6 +718,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`715`	`718`	`fprintf(stderr,`
`716`	`719`	`_("%s: unexpected termination of replication stream: %s"),`
`717`	`720`	`progname, PQresultErrorMessage(res));`
	`721`	`+ PQclear(res);`
`718`	`722`	`goto error;`
`719`	`723`	`}`
`720`	`724`	`}`
`@@ -925,6 +929,7 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,`
`925`	`929`	`PQclear(res);`
`926`	`930`	`goto error;`
`927`	`931`	`}`
	`932`	`+ PQclear(res);`
`928`	`933`	`res = PQgetResult(conn);`
`929`	`934`	`}`
`930`	`935`	`still_sending = false;`