# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1341243322 0
# Node ID 474bbe8ca79c1fdb817e6b2209fff7b85503ddad
# Parent  c3bddd3df3fb15bfd83bc2ea8d76dedaa2cee085
Merge of r4644:

Fixed potential null pointer dereference in ngx_resolver_create().
While here, improved error message.

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
--- 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;
         }