Mercurial > hg > nginx
changeset 4643:bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
While here, improved error message.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 22 May 2012 13:12:14 +0000 |
parents | c1eb924fb6fe |
children | 95763fce86a8 |
files | src/core/ngx_resolver.c |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_resolver.c Mon May 21 10:55:10 2012 +0000 +++ b/src/core/ngx_resolver.c Tue May 22 13:12:14 2012 +0000 @@ -175,7 +175,12 @@ u.port = 53; if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); + if (u.err) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "%s in resolver \"%V\"", + u.err, &u.host); + } + return NULL; }