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

Fix a possible double free that would cause a segfault in

Browse Source 
checkNodeConfiguration()
This commit is contained in:
Carlo Ascani
2011-07-26 18:22:06 -05:00
committed by Jaime Casanova
parent 158214acae
commit c983fdf83c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbutils.c
View File

@@ -101,7 +101,7 @@ bool
is_witness(PGconn *conn, char *schema, char *cluster, int node_id) is_witness(PGconn *conn, char *schema, char *cluster, int node_id)
{ {
PGresult *res; PGresult *res;
bool result; bool result = false;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
sqlquery_snprintf(sqlquery, "SELECT witness from %s.repl_nodes where cluster = '%s' and id = %d", sqlquery_snprintf(sqlquery, "SELECT witness from %s.repl_nodes where cluster = '%s' and id = %d",
@@ -115,9 +115,7 @@ is_witness(PGconn *conn, char *schema, char *cluster, int node_id)
exit(ERR_DB_QUERY); exit(ERR_DB_QUERY);
} }
if (strcmp(PQgetvalue(res, 0, 0), "f") == 0) if (PQntuples(res) == 1 && strcmp(PQgetvalue(res, 0, 0), "t") == 0)
result = false;
else
result = true; result = true;
PQclear(res); PQclear(res);

5
repmgrd.c
View File

@@ -871,7 +871,10 @@ checkNodeConfiguration(char *conninfo)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
} }
PQclear(res); else
{
PQclear(res);
}
} }