From bd8324bb3261aa3cfddf483665b010c8e6d7fa15 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 30 Jan 2012 11:12:52 +0000 Subject: [PATCH] Fixed error handling in ngx_event_connect_peer(). Previously if ngx_add_event() failed a connection was freed two times (once in the ngx_event_connect_peer(), and again by a caller) as pc->connection was left set. Fix is to always use ngx_close_connection() to close connection properly and set pc->connection to NULL on errors. Patch by Piotr Sikora. --- src/event/ngx_event_connect.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index d501b2e53..978f39b42 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -160,6 +160,9 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) ngx_log_error(level, c->log, err, "connect() to %V failed", pc->name); + ngx_close_connection(c); + pc->connection = NULL; + return NGX_DECLINED; } } @@ -241,12 +244,8 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) failed: - ngx_free_connection(c); - - if (ngx_close_socket(s) == -1) { - ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, - ngx_close_socket_n " failed"); - } + ngx_close_connection(c); + pc->connection = NULL; return NGX_ERROR; }