From a0bad5fdc0055083fb7ae390a853684f89559500 Mon Sep 17 00:00:00 2001
From: Ian Barwick <barwick@gmail.com>
Date: Wed, 16 Aug 2017 23:09:02 +0900
Subject: [PATCH] General code cleanup

---
 dbutils.c               |  4 ++++
 repmgr-action-primary.c | 14 ++++++++------
 repmgr-action-standby.c | 19 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/dbutils.c b/dbutils.c
index 03f70eb8..174dc8b0 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -1138,7 +1138,11 @@ _get_primary_connection(PGconn *conn,
 		}
 
 		if (PQstatus(remote_conn) != CONNECTION_OK)
+		{
+			PQfinish(remote_conn);
+			remote_conn = NULL;
 			continue;
+		}
 
 		recovery_type = get_recovery_type(remote_conn);
 
diff --git a/repmgr-action-primary.c b/repmgr-action-primary.c
index ff67d567..6d2584d1 100644
--- a/repmgr-action-primary.c
+++ b/repmgr-action-primary.c
@@ -185,13 +185,15 @@ do_primary_register(void)
 	}
 
 	/* Log the event */
-	create_event_notification(conn,
-						&config_file_options,
-						config_file_options.node_id,
-						"primary_register",
-						record_created,
-						event_description.data);
+	create_event_notification(
+		conn,
+		&config_file_options,
+		config_file_options.node_id,
+		"primary_register",
+		record_created,
+		event_description.data);
 
+	termPQExpBuffer(&event_description);
 
 	PQfinish(conn);
 
diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c
index f31d0622..709decf2 100644
--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
@@ -466,7 +466,7 @@ do_standby_clone(void)
 						true,
 						event_details.data);
 
-	if (PQstatus(primary_conn) == CONNECTION_OK)
+	if (primary_conn != source_conn && PQstatus(primary_conn) == CONNECTION_OK)
 		PQfinish(primary_conn);
 
 	if (PQstatus(source_conn) == CONNECTION_OK)
@@ -1108,6 +1108,7 @@ do_standby_promote(void)
 		exit(ERR_PROMOTION_FAIL);
 	}
 
+	PQfinish(current_primary_conn);
 	PQfinish(conn);
 
 	_do_standby_promote_internal(config_file_options.data_directory);
@@ -1220,6 +1221,7 @@ _do_standby_promote_internal(const char *data_dir)
 						true,
 						details.data);
 
+	termPQExpBuffer(&details);
 	PQfinish(conn);
 
 	return;
@@ -2244,6 +2246,8 @@ do_standby_switchover(void)
 		/* TODO warn about any inactive replication slots*/
 	}
 
+	PQfinish(remote_conn);
+
 	log_notice(_("switchover was successful"));
 	log_detail(_("node \"%s\" is now primary"),
 			   local_node_record.node_name);
@@ -2314,6 +2318,7 @@ do_standby_switchover(void)
 		 * entries in repmgr.nodes match
 		 */
 
+		clear_node_info_list(&sibling_nodes);
 	}
 
 	PQfinish(local_conn);
@@ -2437,11 +2442,13 @@ check_source_server()
 		log_error(_("unable to retrieve source node's data directory"));
 		log_hint(_("STANDBY CLONE must be run as a database superuser"));
 		PQfinish(source_conn);
+		source_conn = NULL;
 		if(superuser_conn != NULL)
 			PQfinish(superuser_conn);
 
 		exit(ERR_BAD_CONFIG);
 	}
+
 	if(superuser_conn != NULL)
 		PQfinish(superuser_conn);
 
@@ -3782,6 +3789,16 @@ parse_node_status_is_shutdown(const char *node_status_output, XLogRecPtr *checkP
 		}
 	}
 
+	pfree(options_string);
+
+	{
+		int i;
+		for (i = 0; i < argc_item + 2; i ++)
+			pfree(argv_array[i]);
+	}
+	pfree(argv_array);
+
+
 	return node_status;
 }