From b7d1e7a0914ae1aaa8260656913db89aed8c8f92 Mon Sep 17 00:00:00 2001
From: Ian Barwick <barwick@gmail.com>
Date: Wed, 28 Jun 2017 13:45:19 +0900
Subject: [PATCH] Minor fixes to get_server_version()

---
 dbutils.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dbutils.c b/dbutils.c
index cdc31194..172e9818 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -428,6 +428,8 @@ int
 get_server_version(PGconn *conn, char *server_version)
 {
 	PGresult   *res;
+	int         server_version_num;
+
 	res = PQexec(conn,
 				 "SELECT current_setting('server_version_num'), "
 				 "       current_setting('server_version')");
@@ -441,9 +443,12 @@ get_server_version(PGconn *conn, char *server_version)
 	}
 
 	if (server_version != NULL)
-		strcpy(server_version, PQgetvalue(res, 0, 0));
+		strcpy(server_version, PQgetvalue(res, 0, 1));
 
-	return atoi(PQgetvalue(res, 0, 0));
+	server_version_num = atoi(PQgetvalue(res, 0, 0));
+
+	PQclear(res);
+	return server_version_num;
 }