mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 17:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Syslog: fixed possible resource leak and more verbose logging.

Browse Source 
Found by Coverity (CID 1215646).
This commit is contained in:
Vladimir Homutov 2014-05-26 23:34:44 +04:00
parent 5c17030671
commit 8e82f06d3e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/ngx_syslog.c
View File

@ -289,14 +289,6 @@ ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
ngx_syslog_dummy_event.log = &ngx_syslog_dummy_log; ngx_syslog_dummy_event.log = &ngx_syslog_dummy_log;
cln = ngx_pool_cleanup_add(peer->pool, 0);
if (cln == NULL) {
return NGX_ERROR;
}
cln->data = peer;
cln->handler = ngx_syslog_cleanup;
fd = ngx_socket(peer->server.sockaddr->sa_family, SOCK_DGRAM, 0); fd = ngx_socket(peer->server.sockaddr->sa_family, SOCK_DGRAM, 0);
if (fd == (ngx_socket_t) -1) { if (fd == (ngx_socket_t) -1) {
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno, ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
@ -307,17 +299,34 @@ ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
if (ngx_nonblocking(fd) == -1) { if (ngx_nonblocking(fd) == -1) {
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno, ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
ngx_nonblocking_n " failed"); ngx_nonblocking_n " failed");
return NGX_ERROR; goto failed;
} }
if (connect(fd, peer->server.sockaddr, peer->server.socklen) == -1) { if (connect(fd, peer->server.sockaddr, peer->server.socklen) == -1) {
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno, ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
"connect() failed"); "connect() failed");
return NGX_ERROR; goto failed;
} }
cln = ngx_pool_cleanup_add(peer->pool, 0);
if (cln == NULL) {
goto failed;
}
cln->data = peer;
cln->handler = ngx_syslog_cleanup;
peer->conn.fd = fd; peer->conn.fd = fd;
return NGX_OK; return NGX_OK;
failed:
if (ngx_close_socket(fd) == -1) {
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
ngx_close_socket_n " failed");
}
return NGX_ERROR;
} }
@ -326,7 +335,8 @@ ngx_syslog_cleanup(void *data)
{ {
ngx_syslog_peer_t *peer = data; ngx_syslog_peer_t *peer = data;
if (peer->conn.fd != (ngx_socket_t) -1) { if (ngx_close_socket(peer->conn.fd) == -1) {
(void) ngx_close_socket(peer->conn.fd); ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
ngx_close_socket_n " failed");
} }
} }