IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak on resolver query send failure

Browse Source
This commit is contained in:
Igor Sysoev 2008-04-09 14:26:08 +00:00
parent f576f0d2bc
commit 949aea4dfe
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ngx_resolver.c
View File

@ -453,6 +453,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
/* lock alloc mutex */ /* lock alloc mutex */
ngx_resolver_free_locked(r, rn->query); ngx_resolver_free_locked(r, rn->query);
rn->query = NULL;
if (rn->cnlen) { if (rn->cnlen) {
ngx_resolver_free_locked(r, rn->u.cname); 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->node.key = hash;
rn->nlen = (u_short) ctx->name.len; rn->nlen = (u_short) ctx->name.len;
rn->query = NULL;
ngx_rbtree_insert(&r->name_rbtree, &rn->node); ngx_rbtree_insert(&r->name_rbtree, &rn->node);
} }
@ -526,6 +528,10 @@ failed:
ngx_rbtree_delete(&r->name_rbtree, &rn->node); 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->name);
ngx_resolver_free(r, rn); ngx_resolver_free(r, rn);
@ -588,6 +594,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
ngx_queue_remove(&rn->queue); ngx_queue_remove(&rn->queue);
ngx_resolver_free(r, rn->query); ngx_resolver_free(r, rn->query);
rn->query = NULL;
} else { } else {
rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t)); 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->node.key = ctx->addr;
rn->query = NULL;
ngx_rbtree_insert(&r->addr_rbtree, &rn->node); ngx_rbtree_insert(&r->addr_rbtree, &rn->node);
} }
@ -646,6 +654,10 @@ failed:
if (rn) { if (rn) {
ngx_rbtree_delete(&r->addr_rbtree, &rn->node); ngx_rbtree_delete(&r->addr_rbtree, &rn->node);
if (rn->query) {
ngx_resolver_free(r, rn->query);
}
ngx_resolver_free(r, rn); ngx_resolver_free(r, rn);
} }