github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 00:26:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix get_cluster_size()

Browse Source 
Was returning a pointer to a cleared PQresult
This commit is contained in:
Ian Barwick
2015-01-06 10:30:33 +09:00
parent 718024454e
commit 3033f2dfaf
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbutils.c
View File

@@ -266,11 +266,10 @@ guc_set_typed(PGconn *conn, const char *parameter, const char *op,
} }
const char * bool
get_cluster_size(PGconn *conn) get_cluster_size(PGconn *conn, char *size)
{ {
PGresult *res; PGresult *res;
const char *size = NULL;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
sqlquery_snprintf( sqlquery_snprintf(
@@ -283,14 +282,15 @@ get_cluster_size(PGconn *conn)
{ {
log_err(_("Get cluster size PQexec failed: %s"), log_err(_("Get cluster size PQexec failed: %s"),
PQerrorMessage(conn)); PQerrorMessage(conn));
}
else PQclear(res);
{ return false;
size = PQgetvalue(res, 0, 0);
} }
strncpy(size, PQgetvalue(res, 0, 0), MAXLEN);
PQclear(res); PQclear(res);
return size; return true;
} }
@@ -307,10 +307,12 @@ get_data_directory(PGconn *conn, char *data_directory)
log_debug(_("get_data_directory(): %s\n"), sqlquery); log_debug(_("get_data_directory(): %s\n"), sqlquery);
res = PQexec(conn, sqlquery); res = PQexec(conn, sqlquery);
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK || PQntuples(res) != 1) if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK || PQntuples(res) != 1)
{ {
log_err(_("get_data_directory() - PQexec failed: %s"), log_err(_("get_data_directory() - PQexec failed: %s"),
PQerrorMessage(conn)); PQerrorMessage(conn));
PQclear(res);
return false; return false;
} }

2
dbutils.h
View File

@@ -31,7 +31,7 @@ int is_standby(PGconn *conn);
int is_witness(PGconn *conn, char *schema, char *cluster, int node_id); int is_witness(PGconn *conn, char *schema, char *cluster, int node_id);
bool is_pgup(PGconn *conn, int timeout); bool is_pgup(PGconn *conn, int timeout);
int get_server_version(PGconn *conn, char *server_version); int get_server_version(PGconn *conn, char *server_version);
const char *get_cluster_size(PGconn *conn); bool get_cluster_size(PGconn *conn, char *size);
bool get_data_directory(PGconn *conn, char *data_directory); bool get_data_directory(PGconn *conn, char *data_directory);
int guc_set(PGconn *conn, const char *parameter, const char *op, int guc_set(PGconn *conn, const char *parameter, const char *op,

6
repmgr.c
View File

@@ -832,7 +832,7 @@ do_standby_clone(void)
PGresult *res; PGresult *res;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
const char *cluster_size; char cluster_size[MAXLEN];
int r = 0, int r = 0,
retval = SUCCESS; retval = SUCCESS;
@@ -941,9 +941,9 @@ do_standby_clone(void)
PQclear(res); PQclear(res);
cluster_size = get_cluster_size(conn); if(get_cluster_size(conn, cluster_size) == false)
if (cluster_size == NULL)
exit(ERR_DB_QUERY); exit(ERR_DB_QUERY);
log_info(_("Successfully connected to master. Current installation size is %s\n"), log_info(_("Successfully connected to master. Current installation size is %s\n"),
cluster_size); cluster_size);