diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 15:35:22 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 15:35:22 +0000 |
| commit | ac12c5f882b91b7693a950ca499a85925a0fe372 (patch) | |
| tree | 93a5b8309813705e9352ace9642f08721f60ea84 /src | |
| parent | ab2ca1706424ba8c9d7bf90c773ddd8b939985da (diff) | |
| download | nginx-ac12c5f882b91b7693a950ca499a85925a0fe372.tar.gz nginx-ac12c5f882b91b7693a950ca499a85925a0fe372.tar.bz2 | |
Merge of r4644:
Fixed potential null pointer dereference in ngx_resolver_create().
While here, improved error message.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_resolver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index edc43dce2..54bd384e8 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -175,7 +175,12 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n) 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; } |