From 949aea4dfe26e300c8e725ffcc8e2ee84f0e5a3a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 9 Apr 2008 14:26:08 +0000 Subject: [PATCH] fix memory leak on resolver query send failure --- src/core/ngx_resolver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index bbc40bae0..e60fbe005 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -453,6 +453,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx) /* lock alloc mutex */ ngx_resolver_free_locked(r, rn->query); + rn->query = NULL; if (rn->cnlen) { ngx_resolver_free_locked(r, rn->u.cname); @@ -479,6 +480,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx) rn->node.key = hash; rn->nlen = (u_short) ctx->name.len; + rn->query = NULL; ngx_rbtree_insert(&r->name_rbtree, &rn->node); } @@ -526,6 +528,10 @@ failed: ngx_rbtree_delete(&r->name_rbtree, &rn->node); + if (rn->query) { + ngx_resolver_free(r, rn->query); + } + ngx_resolver_free(r, rn->name); ngx_resolver_free(r, rn); @@ -588,6 +594,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) ngx_queue_remove(&rn->queue); ngx_resolver_free(r, rn->query); + rn->query = NULL; } else { rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t)); @@ -596,6 +603,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) } rn->node.key = ctx->addr; + rn->query = NULL; ngx_rbtree_insert(&r->addr_rbtree, &rn->node); } @@ -646,6 +654,10 @@ failed: if (rn) { ngx_rbtree_delete(&r->addr_rbtree, &rn->node); + if (rn->query) { + ngx_resolver_free(r, rn->query); + } + ngx_resolver_free(r, rn); }