mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-04 21:46:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix resolving an empty name (".")

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-11 14:27:24 +00:00
parent 61da56d041
commit e79f429b4b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/ngx_resolver.c
View File

@ -1719,13 +1719,14 @@ static ngx_int_t
ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
{ {
u_char *p, *s; u_char *p, *s;
size_t len; size_t len, nlen;
ngx_uint_t ident; ngx_uint_t ident;
ngx_resolver_qs_t *qs; ngx_resolver_qs_t *qs;
ngx_resolver_query_t *query; ngx_resolver_query_t *query;
len = sizeof(ngx_resolver_query_t) nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1;
+ 1 + ctx->name.len + 1 + sizeof(ngx_resolver_qs_t);
len = sizeof(ngx_resolver_query_t) + nlen + sizeof(ngx_resolver_qs_t);
p = ngx_resolver_calloc(ctx->resolver, len); p = ngx_resolver_calloc(ctx->resolver, len);
if (p == NULL) { if (p == NULL) {
@ -1754,8 +1755,7 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
query->nns_hi = 0; query->nns_lo = 0; query->nns_hi = 0; query->nns_lo = 0;
query->nar_hi = 0; query->nar_lo = 0; query->nar_hi = 0; query->nar_lo = 0;
p += sizeof(ngx_resolver_query_t) p += sizeof(ngx_resolver_query_t) + nlen;
+ ctx->name.len ? (1 + ctx->name.len + 1) : 1;
qs = (ngx_resolver_qs_t *) p; qs = (ngx_resolver_qs_t *) p;