pgpool2.git / summary / log / commit / refs

commit    7795327cbddabc7f17de63ea9d43c24909175198
Author:   Yugo Nagata <nagata@sraoss.co.jp>
Date:     Fri Nov 01 12:23:01 2013 +0000

    Fix to close socket when error occurs in wd_create_send_socket()


 src/watchdog/wd_packet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/watchdog/wd_packet.c b/src/watchdog/wd_packet.c
index 2dd6df315..24d191532 100644
--- a/src/watchdog/wd_packet.c
+++ b/src/watchdog/wd_packet.c
@@ -175,11 +175,13 @@ wd_create_send_socket(char * hostname, int port)
 	if ( setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *) &one, sizeof(one)) == -1 )
 	{
 		pool_error("wd_create_send_socket: setsockopt(TCP_NODELAY) failed. reason: %s", strerror(errno));
+		close(sock);
 		return -1;
 	}
 	if ( setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *) &one, sizeof(one)) == -1 )
 	{
 		pool_error("wd_create_send_socket: setsockopt(SO_KEEPALIVE) failed. reason: %s", strerror(errno));
+		close(sock);
 		return -1;
 	}
 


[parent: 8d1e8dce1297]