From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 6 May 2014 12:14:51 +0000 (+0300)
Subject: Fix use of free in walsender error handling after a sysid mismatch.
X-Git-Tag: REL9_4_BETA1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a8e9e977fa642433986e5cd145e3a6f86601c2c;p=thirdparty%2Fpostgresql.git

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

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
index 96f31c4c55b..88d27c7690e 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -152,6 +152,7 @@ libpqrcv_identify_system(TimeLineID *primary_tli)
 			 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"),