Mercurial > hg > nginx

changeset 4715:474bbe8ca79c stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4644: Fixed potential null pointer dereference in ngx_resolver_create(). While here, improved error message.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 02 Jul 2012 15:35:22 +0000
parents c3bddd3df3fb
children d1415d1e7a6b
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
+++ b/src/core/ngx_resolver.c
@@ -175,7 +175,12 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_
         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;
         }