From b1ccbdad7bef41c105b78384eafbf509af91fa36 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 19 Jul 2007 19:11:57 +0000 Subject: [PATCH] fix potential double free(), found by Coverity's Scan --- src/core/ngx_file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 55cfd7ca2..fcb8ff080 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -518,6 +518,9 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_str_t *tree) } ctx->data = data; + + } else { + data = NULL; } for ( ;; ) { @@ -643,8 +646,8 @@ done: ngx_free(buf.data); } - if (ctx->alloc) { - ngx_free(ctx->data); + if (data) { + ngx_free(data); ctx->data = prev; }