Mercurial > hg > nginx
changeset 3306:61bdaac6c668
fix resolving an empty name (".")
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 11 Nov 2009 14:27:24 +0000 |
parents | 8017f9bda3f6 |
children | 34e99a97fbd6 |
files | src/core/ngx_resolver.c |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_resolver.c Wed Nov 11 13:41:16 2009 +0000 +++ b/src/core/ngx_resolver.c Wed Nov 11 14:27:24 2009 +0000 @@ -1719,13 +1719,14 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) { u_char *p, *s; - size_t len; + size_t len, nlen; ngx_uint_t ident; ngx_resolver_qs_t *qs; ngx_resolver_query_t *query; - len = sizeof(ngx_resolver_query_t) - + 1 + ctx->name.len + 1 + sizeof(ngx_resolver_qs_t); + nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1; + + len = sizeof(ngx_resolver_query_t) + nlen + sizeof(ngx_resolver_qs_t); p = ngx_resolver_calloc(ctx->resolver, len); if (p == NULL) { @@ -1754,8 +1755,7 @@ query->nns_hi = 0; query->nns_lo = 0; query->nar_hi = 0; query->nar_lo = 0; - p += sizeof(ngx_resolver_query_t) - + ctx->name.len ? (1 + ctx->name.len + 1) : 1; + p += sizeof(ngx_resolver_query_t) + nlen; qs = (ngx_resolver_qs_t *) p;