Mercurial > hg > nginx

comparison src/core/ngx_resolver.c @ 2484:cf3cd450049c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
store name pointer in variable allocated on stack as resolver ctx may be already deallocated at this point
author Igor Sysoev <igor@sysoev.ru>
date Thu, 29 Jan 2009 14:35:23 +0000
parents 29494780d978
children 8de5dc3e7001
comparison
equal deleted inserted replaced
2483:29494780d978 2484:cf3cd450049c
576 576
577 577
578 ngx_int_t 578 ngx_int_t
579 ngx_resolve_addr(ngx_resolver_ctx_t *ctx) 579 ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
580 { 580 {
581 u_char *name;
581 ngx_resolver_t *r; 582 ngx_resolver_t *r;
582 ngx_resolver_node_t *rn; 583 ngx_resolver_node_t *rn;
583 584
584 r = ctx->resolver; 585 r = ctx->resolver;
585 586
599 600
600 rn->expire = ngx_time() + r->expire; 601 rn->expire = ngx_time() + r->expire;
601 602
602 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue); 603 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue);
603 604
604 ctx->name.len = rn->nlen; 605 name = ngx_resolver_dup(r, rn->name, rn->nlen);
605 ctx->name.data = ngx_resolver_dup(r, rn->name, rn->nlen); 606 if (name == NULL) {
606 if (ctx->name.data == NULL) {
607 goto failed; 607 goto failed;
608 } 608 }
609 609
610 ctx->name.len = rn->nlen;
611 ctx->name.data = name;
612
610 /* unlock addr mutex */ 613 /* unlock addr mutex */
611 614
612 ctx->state = NGX_OK; 615 ctx->state = NGX_OK;
613 616
614 ctx->handler(ctx); 617 ctx->handler(ctx);
615 618
616 ngx_resolver_free(r, ctx->name.data); 619 ngx_resolver_free(r, name);
617 620
618 return NGX_OK; 621 return NGX_OK;
619 } 622 }
620 623
621 if (rn->waiting) { 624 if (rn->waiting) {