From 657aa3013b2315011eddc8aadf0408cf9ad27947 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sun, 6 Feb 2011 21:58:30 -0600 Subject: [PATCH] avoid double free on repmgrd exit as master --- repmgrd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repmgrd.c b/repmgrd.c index 01872071..3f5ec96c 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -36,11 +36,11 @@ /* Local info */ t_configuration_options local_options; int myLocalMode = STANDBY_MODE; -PGconn *myLocalConn; +PGconn *myLocalConn = NULL; /* Primary info */ t_configuration_options primary_options; -PGconn *primaryConn; +PGconn *primaryConn = NULL; char sqlquery[QUERY_STR_LEN]; @@ -71,7 +71,7 @@ static void setup_cancel_handler(void); CancelQuery(); \ if (myLocalConn != NULL) \ PQfinish(myLocalConn); \ - if (primaryConn != NULL) \ + if (primaryConn != NULL && primaryConn != myLocalConn) \ PQfinish(primaryConn); /*