Mercurial > hg > nginx-quic

comparison src/core/ngx_resolver.c @ 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 c92289afb5be
children 68ac485abbba
comparison
equal deleted inserted replaced
4714:c3bddd3df3fb 4715:474bbe8ca79c
173 173
174 u.host = names[i]; 174 u.host = names[i];
175 u.port = 53; 175 u.port = 53;
176 176
177 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { 177 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
178 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); 178 if (u.err) {
179 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
180 "%s in resolver \"%V\"",
181 u.err, &u.host);
182 }
183
179 return NULL; 184 return NULL;
180 } 185 }
181 186
182 uc = ngx_array_push(&r->udp_connections); 187 uc = ngx_array_push(&r->udp_connections);
183 if (uc == NULL) { 188 if (uc == NULL) {