Fix use of free in walsender error handling after a sysid mismatch.

hlinnaka · hlinnaka · commit d65ecdf4110b · 2014-05-06T15:17:14.000+03:00
Found via valgrind. The bug exists since the introduction of the walsender,
so backpatch to 9.0.

Andres Freund
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -133,6 +133,7 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)
 			 GetSystemIdentifier());
 	if (strcmp(primary_sysid, standby_sysid) != 0)
 	{
+		primary_sysid = pstrdup(primary_sysid);
 		PQclear(res);
 		ereport(ERROR,
 				(errmsg("database system identifier differs between the primary and standby"),

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)`
`133`	`133`	`GetSystemIdentifier());`
`134`	`134`	`if (strcmp(primary_sysid, standby_sysid) != 0)`
`135`	`135`	`{`
	`136`	`+ primary_sysid = pstrdup(primary_sysid);`
`136`	`137`	`PQclear(res);`
`137`	`138`	`ereport(ERROR,`
`138`	`139`	`(errmsg("database system identifier differs between the primary and standby"),`